All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Krzysztof Wilczyński" <kw@linux.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Subject: [PATCH 1/2] PCI: syscall: Set the ~0 value on access failure
Date: Thu, 29 Jul 2021 23:37:54 +0000	[thread overview]
Message-ID: <20210729233755.1509616-1-kw@linux.com> (raw)

The pciconfig_read syscall has a special provision to handle users that
don't check the return value for a possible error code and rely solely
on checking for the value of ~0 to be set as a result of the PCI
configuration read failure.

The commit e4585da22ad0 ("pci syscall.c: Switch to refcounting API")
changed this semantic of setting the results to the value of ~0 to
indicate read error concerning CAP_SYS_ADMIN capability flag validation.
After this commit, the syscall would simply return -EPERM early should
the user does not have the required permissions.  This changes the
original behaviour which might not be something that the users of this
syscall expect, especially since some of the problematic users do not
check the return code whatsoever.

Thus, restore the original behaviour of setting the results to a value
of ~0 on read failure to include the capabilities check.

Fixes: e4585da22ad0 ("pci syscall.c: Switch to refcounting API")
Signed-off-by: Krzysztof Wilczyński <kw@linux.com>
---
 drivers/pci/syscall.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
index 8b003c890b87..b842af1e06b8 100644
--- a/drivers/pci/syscall.c
+++ b/drivers/pci/syscall.c
@@ -22,8 +22,9 @@ SYSCALL_DEFINE5(pciconfig_read, unsigned long, bus, unsigned long, dfn,
 	long err;
 	int cfg_ret;
 
+	err = -EPERM;
 	if (!capable(CAP_SYS_ADMIN))
-		return -EPERM;
+		goto error;
 
 	err = -ENODEV;
 	dev = pci_get_domain_bus_and_slot(0, bus, dfn);
-- 
2.32.0


             reply	other threads:[~2021-07-29 23:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-29 23:37 Krzysztof Wilczyński [this message]
2021-07-29 23:37 ` [PATCH 2/2] PCI: syscall: Change type of err variable from long to int Krzysztof Wilczyński
2021-07-30 21:06   ` Bjorn Helgaas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210729233755.1509616-1-kw@linux.com \
    --to=kw@linux.com \
    --cc=bhelgaas@google.com \
    --cc=linux-pci@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.