[src/netbsd-3-0]: src/sys/kern Pull up following revision(s) (requested by el...

[ghen <ghen%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71691ff75d2a
branches:  netbsd-3-0
changeset: 579319:71691ff75d2a
user:      ghen <ghen%NetBSD.org@localhost>
date:      Tue Oct 24 16:59:02 2006 +0000

description:
Pull up following revision(s) (requested by elad in ticket #1566):
        sys/kern/uipc_syscalls.c: revision 1.104
PR/34873: Ryo Shimizu: sendmsg() can cause kernel panic
Patch applied, thanks!

diffstat:

 sys/kern/uipc_syscalls.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 6c0a17d7debb -r 71691ff75d2a sys/kern/uipc_syscalls.c
--- a/sys/kern/uipc_syscalls.c  Tue Oct 24 16:33:33 2006 +0000
+++ b/sys/kern/uipc_syscalls.c  Tue Oct 24 16:59:02 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_syscalls.c,v 1.90.2.4.2.1 2006/08/25 11:34:02 ghen Exp $  */
+/*     $NetBSD: uipc_syscalls.c,v 1.90.2.4.2.2 2006/10/24 16:59:02 ghen Exp $  */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.90.2.4.2.1 2006/08/25 11:34:02 ghen Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.90.2.4.2.2 2006/10/24 16:59:02 ghen Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_pipe.h"
@@ -519,7 +519,7 @@
        } else
                to = 0;
        if (mp->msg_control) {
-               if (mp->msg_controllen < sizeof(struct cmsghdr)) {
+               if (mp->msg_controllen < CMSG_ALIGN(sizeof(struct cmsghdr))) {
                        error = EINVAL;
                        goto bad;
                }