Author: erj
Date: Fri Jan 10 18:31:59 2020
New Revision: 356606
URL: https://svnweb.freebsd.org/changeset/base/356606
Log:
MFC r356309: ixl: prevent non-privileged access to NVM update interface
Sponsored by: Intel Corporation
Modified:
stable/12/sys/dev/ixl/if_ixl.c
stable/12/sys/dev/ixl/ixl.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/ixl/if_ixl.c
==============================================================================
--- stable/12/sys/dev/ixl/if_ixl.c Fri Jan 10 18:29:05 2020
(r356605)
+++ stable/12/sys/dev/ixl/if_ixl.c Fri Jan 10 18:31:59 2020
(r356606)
@@ -1625,11 +1625,29 @@ ixl_if_priv_ioctl(if_ctx_t ctx, u_long command, caddr_
struct ifdrv *ifd = (struct ifdrv *)data;
int error = 0;
- /* NVM update command */
- if (ifd->ifd_cmd == I40E_NVM_ACCESS)
- error = ixl_handle_nvmupd_cmd(pf, ifd);
- else
- error = EINVAL;
+ /*
+ * The iflib_if_ioctl forwards SIOCxDRVSPEC and SIOGPRIVATE_0 without
+ * performing privilege checks. It is important that this function
+ * perform the necessary checks for commands which should only be
+ * executed by privileged threads.
+ */
+
+ switch(command) {
+ case SIOCGDRVSPEC:
+ case SIOCSDRVSPEC:
+ /* NVM update command */
+ if (ifd->ifd_cmd == I40E_NVM_ACCESS) {
+ error = priv_check(curthread, PRIV_DRIVER);
+ if (error)
+ break;
+ error = ixl_handle_nvmupd_cmd(pf, ifd);
+ } else {
+ error = EINVAL;
+ }
+ break;
+ default:
+ error = EOPNOTSUPP;
+ }
return (error);
}
Modified: stable/12/sys/dev/ixl/ixl.h
==============================================================================
--- stable/12/sys/dev/ixl/ixl.h Fri Jan 10 18:29:05 2020 (r356605)
+++ stable/12/sys/dev/ixl/ixl.h Fri Jan 10 18:31:59 2020 (r356606)
@@ -52,6 +52,7 @@
#include <sys/sockio.h>
#include <sys/eventhandler.h>
#include <sys/syslog.h>
+#include <sys/priv.h>
#include <net/if.h>
#include <net/if_var.h>
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
