[src/netbsd-6-1]: src Pullup ticket #927:

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

details:   https://anonhg.NetBSD.org/src/rev/d6fd175dfff2
branches:  netbsd-6-1
changeset: 775824:d6fd175dfff2
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Aug 02 20:18:48 2013 +0000

description:
Pullup ticket #927:

sys/kern/uipc_socket.c                          1.216

        Fix an inversion in checking for authorization to drop TCP connections
        found (and the obvious fix suggested) by Sander Bos.

Requested by spz.

diffstat:

 doc/CHANGES-6.1.1      |  8 +++++++-
 sys/kern/uipc_socket.c |  6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 4c7c3d3f7082 -r d6fd175dfff2 doc/CHANGES-6.1.1
--- a/doc/CHANGES-6.1.1 Tue Jul 30 04:08:45 2013 +0000
+++ b/doc/CHANGES-6.1.1 Fri Aug 02 20:18:48 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.1,v 1.1.2.15 2013/07/30 04:08:45 msaitoh Exp $
+# $NetBSD: CHANGES-6.1.1,v 1.1.2.16 2013/08/02 20:18:48 martin Exp $
 
 A complete list of changes from the NetBSD 6.1 release to the NetBSD 6.1.1
 release:
@@ -168,3 +168,9 @@
 
        Stop abusing kmem during softint context to prevent panic.
        [kefren, ticket #921]
+
+sys/kern: uipc_socket.c                                1.216
+
+       Fix an inversion in checking for authorization to drop TCP connections
+       found (and the obvious fix suggested) by Sander Bos.
+       [spz, ticket #927]
diff -r 4c7c3d3f7082 -r d6fd175dfff2 sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c    Tue Jul 30 04:08:45 2013 +0000
+++ b/sys/kern/uipc_socket.c    Fri Aug 02 20:18:48 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket.c,v 1.209.2.2 2013/02/14 22:13:59 jdc Exp $        */
+/*     $NetBSD: uipc_socket.c,v 1.209.2.2.2.1 2013/08/02 20:18:48 martin Exp $ */
 
 /*-
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209.2.2 2013/02/14 22:13:59 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209.2.2.2.1 2013/08/02 20:18:48 martin Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_sock_counters.h"
@@ -416,7 +416,7 @@
                /* Normal users can only drop their own connections. */
                struct socket *so = (struct socket *)arg1;
 
-               if (proc_uidmatch(cred, so->so_cred))
+               if (proc_uidmatch(cred, so->so_cred) == 0)
                        result = KAUTH_RESULT_ALLOW;
 
                break;