[src/trunk]: src/sys/kern Always use resource limits from the process, as pro...

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

details:   https://anonhg.NetBSD.org/src/rev/41268270fd39
branches:  trunk
changeset: 750409:41268270fd39
user:      elad <elad%NetBSD.org@localhost>
date:      Wed Dec 30 18:33:53 2009 +0000

description:
Always use resource limits from the process, as proposed in

        http://mail-index.netbsd.org/tech-kern/2009/12/30/msg006756.html

okay christos@.

diffstat:

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

diffs (30 lines):

diff -r 8458da4401f4 -r 41268270fd39 sys/kern/uipc_socket2.c
--- a/sys/kern/uipc_socket2.c   Wed Dec 30 17:16:49 2009 +0000
+++ b/sys/kern/uipc_socket2.c   Wed Dec 30 18:33:53 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket2.c,v 1.104 2009/09/02 14:56:57 tls Exp $   */
+/*     $NetBSD: uipc_socket2.c,v 1.105 2009/12/30 18:33:53 elad Exp $  */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.104 2009/09/02 14:56:57 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.105 2009/12/30 18:33:53 elad Exp $");
 
 #include "opt_mbuftrace.h"
 #include "opt_sb_max.h"
@@ -597,10 +597,7 @@
        if (cc == 0 || cc > sb_max_adj)
                return (0);
 
-       if (kauth_cred_geteuid(l->l_cred) == so->so_uidinfo->ui_uid)
-               maxcc = l->l_proc->p_rlimit[RLIMIT_SBSIZE].rlim_cur;
-       else
-               maxcc = RLIM_INFINITY;
+       maxcc = l->l_proc->p_rlimit[RLIMIT_SBSIZE].rlim_cur;
 
        uidinfo = so->so_uidinfo;
        if (!chgsbsize(uidinfo, &sb->sb_hiwat, cc, maxcc))