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 <sasha.levin@oracle.com>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ming Lei 2015-01-13 00:01:35 +08:00 committed by Greg Kroah-Hartman
parent 3c1556b287
commit 0cb64249ca
1 changed files with 7 additions and 0 deletions

View File

@ -927,6 +927,13 @@ static int _request_firmware_load(struct firmware_priv *fw_priv,
retval = wait_for_completion_interruptible(&buf->completion); retval = wait_for_completion_interruptible(&buf->completion);
cancel_delayed_work_sync(&fw_priv->timeout_work); 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)) if (is_fw_load_aborted(buf))
retval = -EAGAIN; retval = -EAGAIN;
else if (!buf->data) else if (!buf->data)