summaryrefslogtreecommitdiffstats
path: root/fs/efivarfs
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2020-05-28 12:49:05 -0700
committerArd Biesheuvel <ardb@kernel.org>2020-06-15 14:38:56 +0200
commit4353f03317fd3eb0bd803b61bdb287b68736a728 (patch)
treef42a3901f5c168a091da25d3ad82f8584be2d36f /fs/efivarfs
parent2096721f1577b51b574fa06a7d91823dffe7267a (diff)
downloadlinux-4353f03317fd3eb0bd803b61bdb287b68736a728.tar.gz
linux-4353f03317fd3eb0bd803b61bdb287b68736a728.tar.bz2
linux-4353f03317fd3eb0bd803b61bdb287b68736a728.zip
efivarfs: Don't return -EINTR when rate-limiting reads
Applications that read EFI variables may see a return value of -EINTR if they exceed the rate limit and a signal delivery is attempted while the process is sleeping. This is quite surprising to the application, which probably doesn't have code to handle it. Change the interruptible sleep to a non-interruptible one. Reported-by: Lennart Poettering <mzxreary@0pointer.de> Signed-off-by: Tony Luck <tony.luck@intel.com> Link: https://lore.kernel.org/r/20200528194905.690-3-tony.luck@intel.com Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'fs/efivarfs')
-rw-r--r--fs/efivarfs/file.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/efivarfs/file.c b/fs/efivarfs/file.c
index 4b8bc4560d70..feaa5e182b7b 100644
--- a/fs/efivarfs/file.c
+++ b/fs/efivarfs/file.c
@@ -73,10 +73,8 @@ static ssize_t efivarfs_file_read(struct file *file, char __user *userbuf,
ssize_t size = 0;
int err;
- while (!__ratelimit(&file->f_cred->user->ratelimit)) {
- if (!msleep_interruptible(50))
- return -EINTR;
- }
+ while (!__ratelimit(&file->f_cred->user->ratelimit))
+ msleep(50);
err = efivar_entry_size(var, &datasize);