[src/netbsd-7-1]: src/sys/dev/ic Pull up following revision(s) (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/de82bf082b3e
branches:  netbsd-7-1
changeset: 801012:de82bf082b3e
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Dec 17 16:34:26 2019 +0000

description:
Pull up following revision(s) (requested by christos in ticket #1718):

        sys/dev/ic/ath.c: revision 1.129

Protect network ioctls from non-authorized users. (Ilja Van Sprundel)

diffstat:

 sys/dev/ic/ath.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r f423a4f3f6c3 -r de82bf082b3e sys/dev/ic/ath.c
--- a/sys/dev/ic/ath.c  Sun Dec 08 10:27:05 2019 +0000
+++ b/sys/dev/ic/ath.c  Tue Dec 17 16:34:26 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ath.c,v 1.116 2013/09/12 12:17:53 martin Exp $ */
+/*     $NetBSD: ath.c,v 1.116.10.1 2019/12/17 16:34:26 martin Exp $    */
 
 /*-
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
 __FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.116 2013/09/12 12:17:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.116.10.1 2019/12/17 16:34:26 martin Exp $");
 #endif
 
 /*
@@ -69,6 +69,7 @@
 #include <sys/callout.h>
 #include <sys/bus.h>
 #include <sys/endian.h>
+#include <sys/kauth.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -5362,6 +5363,12 @@
                return copyout(&sc->sc_stats,
                                ifr->ifr_data, sizeof (sc->sc_stats));
        case SIOCGATHDIAG:
+               error = kauth_authorize_network(curlwp->l_cred,
+                   KAUTH_NETWORK_INTERFACE,
+                   KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, KAUTH_ARG(cmd),
+                   NULL);
+               if (error)
+                       break;
                error = ath_ioctl_diag(sc, (struct ath_diag *) ifr);
                break;
        default: