evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

firmware_class: Correct a null check in firmware_direct_read

Browse source 
Don't use the fw pointer before performing the null
check on it.

Change-Id: I303f71681647e2acb0b7e340b8f8580436cfb19d
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
This commit is contained in:
Vikram Mulukutla 2014-08-07 17:36:23 -07:00 • committed by David Keitel
parent 2d65cf38d3
commit 9543a56f10
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/base/firmware_class.c
View file

@ -801,6 +801,9 @@ static ssize_t firmware_direct_read(struct file *filp, struct kobject *kobj,
struct firmware *fw; struct firmware *fw;
ssize_t ret_count; ssize_t ret_count;
if (!fw_priv->fw)
return -ENODEV;
mutex_lock(&fw_lock); mutex_lock(&fw_lock);
fw = fw_priv->fw; fw = fw_priv->fw;
@ -811,7 +814,7 @@ static ssize_t firmware_direct_read(struct file *filp, struct kobject *kobj,
if (count > fw->size - offset) if (count > fw->size - offset)
count = fw->size - offset; count = fw->size - offset;
if (!fw || test_bit(FW_STATUS_DONE, &fw_priv->buf->status)) { if (test_bit(FW_STATUS_DONE, &fw_priv->buf->status)) {
ret_count = -ENODEV; ret_count = -ENODEV;
goto out; goto out;
} }