[src/netbsd-2]: src/sys/kern Pull up following revision(s) (requested by adri...

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

details:   https://anonhg.NetBSD.org/src/rev/452efa252508
branches:  netbsd-2
changeset: 564553:452efa252508
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Oct 29 13:03:46 2006 +0000

description:
Pull up following revision(s) (requested by adrianp in ticket #10740):
        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 6f56c9106ae6 -r 452efa252508 sys/kern/uipc_syscalls.c
--- a/sys/kern/uipc_syscalls.c  Sun Oct 29 13:01:15 2006 +0000
+++ b/sys/kern/uipc_syscalls.c  Sun Oct 29 13:03:46 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_syscalls.c,v 1.86.2.1.2.1 2006/08/28 14:51:19 tron Exp $  */
+/*     $NetBSD: uipc_syscalls.c,v 1.86.2.1.2.2 2006/10/29 13:03:46 tron 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.86.2.1.2.1 2006/08/28 14:51:19 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.86.2.1.2.2 2006/10/29 13:03:46 tron Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_pipe.h"
@@ -517,7 +517,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;
                }