Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2035e8e3 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Greg Kroah-Hartman
Browse files

PCI: Align checking of syscall user config accessors 

[ Upstream commit ef9e4005cbaf022c6251263aa27836acccaef65d ]

After 34e32072 ("PCI: handle positive error codes"),
pci_user_read_config_*() and pci_user_write_config_*() return 0 or negative
errno values, not PCIBIOS_* values like PCIBIOS_SUCCESSFUL or
PCIBIOS_BAD_REGISTER_NUMBER.

Remove comparisons with PCIBIOS_SUCCESSFUL and check only for non-zero.  It
happens that PCIBIOS_SUCCESSFUL is zero, so this is not a functional
change, but it aligns this code with the user accessors.

[bhelgaas: commit log]
Fixes: 34e32072 ("PCI: handle positive error codes")
Link: https://lore.kernel.org/r/f1220314-e518-1e18-bf94-8e6f8c703758@gmail.com


Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ec35ff32

drivers/pci/syscall.c

+5 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ SYSCALL_DEFINE5(pciconfig_read, unsigned long, bus, unsigned long, dfn, 
	u16 word;

	u32 dword;

	long err;

	long cfg_ret;

	int cfg_ret;



	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;
@@ -47,7 +47,7 @@ SYSCALL_DEFINE5(pciconfig_read, unsigned long, bus, unsigned long, dfn, 
	}



	err = -EIO;

	if (cfg_ret != PCIBIOS_SUCCESSFUL)

	if (cfg_ret)

		goto error;



	switch (len) {
@@ -105,7 +105,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn, 
		if (err)

			break;

		err = pci_user_write_config_byte(dev, off, byte);

		if (err != PCIBIOS_SUCCESSFUL)

		if (err)

			err = -EIO;

		break;
@@ -114,7 +114,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn, 
		if (err)

			break;

		err = pci_user_write_config_word(dev, off, word);

		if (err != PCIBIOS_SUCCESSFUL)

		if (err)

			err = -EIO;

		break;
@@ -123,7 +123,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn, 
		if (err)

			break;

		err = pci_user_write_config_dword(dev, off, dword);

		if (err != PCIBIOS_SUCCESSFUL)

		if (err)

			err = -EIO;

		break;