Module Name: src
Committed By: elad
Date: Sat Oct 3 03:59:39 UTC 2009
Modified Files:
src/sys/kern: uipc_socket.c
src/sys/secmodel/suser: secmodel_suser.c
Log Message:
Move KAUTH_NETWORK_BIND::KAUTH_REQ_NETWORK_BIND_PORT policy back to the
subsystem (or close to it).
Note: Revisit KAUTH_REQ_NETWORK_BIND_PRIVPORT.
To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.25 -r1.26 src/sys/secmodel/suser/secmodel_suser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.192 src/sys/kern/uipc_socket.c:1.193
--- src/sys/kern/uipc_socket.c:1.192 Sat Oct 3 01:41:39 2009
+++ src/sys/kern/uipc_socket.c Sat Oct 3 03:59:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.192 2009/10/03 01:41:39 elad Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.193 2009/10/03 03:59:39 elad 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.192 2009/10/03 01:41:39 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.193 2009/10/03 03:59:39 elad Exp $");
#include "opt_compat_netbsd.h"
#include "opt_sock_counters.h"
@@ -440,10 +440,15 @@
result = KAUTH_RESULT_DEFER;
req = (enum kauth_network_req)arg0;
- if (action != KAUTH_NETWORK_SOCKET)
+ if ((action != KAUTH_NETWORK_SOCKET) &&
+ (action != KAUTH_NETWORK_BIND))
return result;
switch (req) {
+ case KAUTH_REQ_NETWORK_BIND_PORT:
+ result = KAUTH_RESULT_ALLOW;
+ break;
+
case KAUTH_REQ_NETWORK_SOCKET_DROP: {
/* Normal users can only drop their own connections. */
struct socket *so = (struct socket *)arg1;
Index: src/sys/secmodel/suser/secmodel_suser.c
diff -u src/sys/secmodel/suser/secmodel_suser.c:1.25 src/sys/secmodel/suser/secmodel_suser.c:1.26
--- src/sys/secmodel/suser/secmodel_suser.c:1.25 Sat Oct 3 03:38:31 2009
+++ src/sys/secmodel/suser/secmodel_suser.c Sat Oct 3 03:59:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_suser.c,v 1.25 2009/10/03 03:38:31 elad Exp $ */
+/* $NetBSD: secmodel_suser.c,v 1.26 2009/10/03 03:59:39 elad Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <e...@netbsd.org>
* All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.25 2009/10/03 03:38:31 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.26 2009/10/03 03:59:39 elad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -611,10 +611,6 @@
case KAUTH_NETWORK_BIND:
switch (req) {
- case KAUTH_REQ_NETWORK_BIND_PORT:
- result = KAUTH_RESULT_ALLOW;
- break;
-
case KAUTH_REQ_NETWORK_BIND_PRIVPORT:
if (isroot)
result = KAUTH_RESULT_ALLOW;
