summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2002-08-09 05:50:32 +0000
committerRobert Watson <rwatson@FreeBSD.org>2002-08-09 05:50:32 +0000
commit82d9ad331ac0a07c584b40ac3fb32498467dd9a5 (patch)
tree1d6702f280f1be1e6b3240923376174a6ff914de
parent438b0be9fa61747820411e73175a43d4156687ae (diff)
Notes
-rw-r--r--sys/i386/isa/vesa.c4
-rw-r--r--sys/kern/uipc_syscalls.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index 0fa16b5e928a..99eb554a1626 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -1330,7 +1330,9 @@ get_palette(video_adapter_t *adp, int base, int count,
int bits;
int error;
- if ((base < 0) || (base >= 256) || (base + count > 256))
+ if ((base < 0) || (base >= 256) || (count < 0) || (count > 256))
+ return 1;
+ if ((base + count) > 256)
return 1;
if (!(vesa_adp_info->v_flags & V_DAC8) || !VESA_MODE(adp->va_mode))
return 1;
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index d9c4d88fabd0..9eb24354354f 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -256,6 +256,8 @@ accept1(td, uap, compat)
error = copyin(uap->anamelen, &namelen, sizeof (namelen));
if(error)
goto done2;
+ if (namelen < 0)
+ return (EINVAL);
}
error = fgetsock(td, uap->s, &head, &fflag);
if (error)