diff options
| author | eadler <eadler@FreeBSD.org> | 2013-11-30 22:17:27 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2013-11-30 22:17:27 +0000 |
| commit | 44c01df17391f4429ee371e8039ae4fd802c2a8e (patch) | |
| tree | 050fb3b68519f6ef7d59051550fa29cdd79d6dac /sys/amd64/pci/pci_cfgreg.c | |
| parent | 5bcb8c5f4293579e5f8aba6f33f85246b7b70e5d (diff) | |
| download | FreeBSD-src-44c01df17391f4429ee371e8039ae4fd802c2a8e.zip FreeBSD-src-44c01df17391f4429ee371e8039ae4fd802c2a8e.tar.gz | |
Fix undefined behavior: (1 << 31) is not defined as 1 is an int and this
shifts into the sign bit. Instead use (1U << 31) which gets the
expected result.
This fix is not ideal as it assumes a 32 bit int, but does fix the issue
for most cases.
A similar change was made in OpenBSD.
Discussed with: -arch, rdivacky
Reviewed by: cperciva
Diffstat (limited to 'sys/amd64/pci/pci_cfgreg.c')
| -rw-r--r-- | sys/amd64/pci/pci_cfgreg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c index 90d9087..706fdd3 100644 --- a/sys/amd64/pci/pci_cfgreg.c +++ b/sys/amd64/pci/pci_cfgreg.c @@ -184,7 +184,7 @@ pci_cfgenable(unsigned bus, unsigned slot, unsigned func, int reg, int bytes) if (bus <= PCI_BUSMAX && slot <= PCI_SLOTMAX && func <= PCI_FUNCMAX && (unsigned)reg <= PCI_REGMAX && bytes != 3 && (unsigned)bytes <= 4 && (reg & (bytes - 1)) == 0) { - outl(CONF1_ADDR_PORT, (1 << 31) | (bus << 16) | (slot << 11) + outl(CONF1_ADDR_PORT, (1U << 31) | (bus << 16) | (slot << 11) | (func << 8) | (reg & ~0x03)); dataport = CONF1_DATA_PORT + (reg & 0x03); } |
