Module Name: src Committed By: riastradh Date: Wed May 28 04:41:52 UTC 2014
Modified Files: src/sys/dev/pci: pci_usrreq.c Log Message: Reject unaligned PCI config register ioctl requests before we kassert. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/pci_usrreq.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/dev/pci/pci_usrreq.c diff -u src/sys/dev/pci/pci_usrreq.c:1.25 src/sys/dev/pci/pci_usrreq.c:1.26 --- src/sys/dev/pci/pci_usrreq.c:1.25 Sun Mar 16 05:20:28 2014 +++ src/sys/dev/pci/pci_usrreq.c Wed May 28 04:41:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_usrreq.c,v 1.25 2014/03/16 05:20:28 dholland Exp $ */ +/* $NetBSD: pci_usrreq.c,v 1.26 2014/05/28 04:41:52 riastradh Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.25 2014/03/16 05:20:28 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.26 2014/05/28 04:41:52 riastradh Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -83,7 +83,7 @@ pciioctl(dev_t dev, u_long cmd, void *da case PCI_IOC_BDF_CFGWRITE: bdfr = data; if (bdfr->bus > 255 || bdfr->device >= sc->sc_maxndevs || - bdfr->function > 7) + bdfr->function > 7 || ISSET(bdfr->cfgreg.reg, 3)) return EINVAL; tag = pci_make_tag(sc->sc_pc, bdfr->bus, bdfr->device, bdfr->function);