[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20170720201342.7320-3-mcgrof@kernel.org>
Date: Thu, 20 Jul 2017 13:13:39 -0700
From: "Luis R. Rodriguez" <mcgrof@...nel.org>
To: gregkh@...uxfoundation.org
Cc: wagi@...om.org, yi1.li@...ux.intel.com, takahiro.akashi@...aro.org,
bjorn.andersson@...aro.org, luto@...nel.org, ebiederm@...ssion.com,
dmitry.torokhov@...il.com, arend.vanspriel@...adcom.com,
dwmw2@...radead.org, rjw@...ysocki.net, atull@...nel.org,
moritz.fischer@...us.com, pmladek@...e.com,
johannes.berg@...el.com, emmanuel.grumbach@...el.com,
luciano.coelho@...el.com, kvalo@...eaurora.org,
torvalds@...ux-foundation.org, keescook@...omium.org,
dhowells@...hat.com, pjones@...hat.com, hdegoede@...hat.com,
alan@...ux.intel.com, tytso@....edu, dave@...olabs.net,
mawilcox@...rosoft.com, tglx@...utronix.de, peterz@...radead.org,
mfuzzey@...keon.com, jakub.kicinski@...ronome.com,
nbroeking@...com, jewalt@...innovations.com,
linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org,
"Luis R. Rodriguez" <mcgrof@...nel.org>
Subject: [PATCH v4 2/5] firmware: send -EINTR on signal abort on fallback mechanism
Right now we send -EAGAIN to a syfs write which got interrupted.
Userspace can't tell what happened though, send -EINTR if we
were killed due to a signal so userspace can tell things apart.
This is only applicable to the fallback mechanism.
Reported-by: Martin Fuzzey <mfuzzey@...keon.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@...nel.org>
---
drivers/base/firmware_class.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index bfbe1e154128..0125e605eb34 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -1085,9 +1085,12 @@ static int _request_firmware_load(struct firmware_priv *fw_priv,
mutex_unlock(&fw_lock);
}
- if (fw_state_is_aborted(&buf->fw_st))
- retval = -EAGAIN;
- else if (buf->is_paged_buf && !buf->data)
+ if (fw_state_is_aborted(&buf->fw_st)) {
+ if (retval == -ERESTARTSYS)
+ retval = -EINTR;
+ else
+ retval = -EAGAIN;
+ } else if (buf->is_paged_buf && !buf->data)
retval = -ENOMEM;
device_del(f_dev);
--
2.11.0
Powered by blists - more mailing lists