From 0cb64249ca50033ec22e63582837f94202c63d9f Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Tue, 13 Jan 2015 00:01:35 +0800 Subject: [PATCH] firmware_loader: abort request if wait_for_completion is interrupted If current request is interrupted by signal, such as 'ctrl + c', this request has to be aborted for the following reasons: - the buf need to be removed from pending list - same requests from other contexts need to be completed Reported-by: Sasha Levin Signed-off-by: Ming Lei Signed-off-by: Greg Kroah-Hartman --- drivers/base/firmware_class.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 96d994a35372..5870ec35efe6 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -927,6 +927,13 @@ static int _request_firmware_load(struct firmware_priv *fw_priv, retval = wait_for_completion_interruptible(&buf->completion); cancel_delayed_work_sync(&fw_priv->timeout_work); + + if (retval == -ERESTARTSYS) { + mutex_lock(&fw_lock); + fw_load_abort(fw_priv); + mutex_unlock(&fw_lock); + } + if (is_fw_load_aborted(buf)) retval = -EAGAIN; else if (!buf->data) -- 2.39.5