[src/trunk]: src/sys/net PR/30285: Mile Nordin: incorrect permission check jo...

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

details:   https://anonhg.NetBSD.org/src/rev/f7834f51ff84
branches:  trunk
changeset: 581024:f7834f51ff84
user:      christos <christos%NetBSD.org@localhost>
date:      Fri May 20 16:23:05 2005 +0000

description:
PR/30285: Mile Nordin: incorrect permission check joining/leaving multicast
groups.

diffstat:

 sys/net/if_gif.c |  6 ++----
 sys/net/if_gre.c |  6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diffs (54 lines):

diff -r 9fded5737436 -r f7834f51ff84 sys/net/if_gif.c
--- a/sys/net/if_gif.c  Fri May 20 16:13:00 2005 +0000
+++ b/sys/net/if_gif.c  Fri May 20 16:23:05 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gif.c,v 1.50 2005/02/26 22:45:09 perry Exp $        */
+/*     $NetBSD: if_gif.c,v 1.51 2005/05/20 16:23:05 christos Exp $     */
 /*     $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $    */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.50 2005/02/26 22:45:09 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.51 2005/05/20 16:23:05 christos Exp $");
 
 #include "opt_inet.h"
 #include "opt_iso.h"
@@ -602,8 +602,6 @@
 
        case SIOCADDMULTI:
        case SIOCDELMULTI:
-               if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
-                       break;
                switch (ifr->ifr_addr.sa_family) {
 #ifdef INET
                case AF_INET:   /* IP supports Multicast */
diff -r 9fded5737436 -r f7834f51ff84 sys/net/if_gre.c
--- a/sys/net/if_gre.c  Fri May 20 16:13:00 2005 +0000
+++ b/sys/net/if_gre.c  Fri May 20 16:23:05 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gre.c,v 1.56 2005/03/30 16:34:54 is Exp $ */
+/*     $NetBSD: if_gre.c,v 1.57 2005/05/20 16:23:05 christos Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.56 2005/03/30 16:34:54 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.57 2005/05/20 16:23:05 christos Exp $");
 
 #include "opt_inet.h"
 #include "opt_ns.h"
@@ -383,8 +383,6 @@
                break;
        case SIOCADDMULTI:
        case SIOCDELMULTI:
-               if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
-                       break;
                if (ifr == 0) {
                        error = EAFNOSUPPORT;
                        break;