summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-02-15 06:11:26 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-02-15 06:11:26 -0800
commit737d15972b03095efed5d487fc2e4b3fa5e98378 (patch)
tree0dccb65b78ef20fb734ece6de34a235b149a474c
parentde97496f9b160f5563df7efecc01581cb71c67e5 (diff)
parenta67da1d6f3808ab567082d5401c8c57f099fdb94 (diff)
Merge "firmware_class: Add null check in firmware_direct_write"
-rw-r--r--drivers/base/firmware_class.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 152c81ca50ea..87a48268b663 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -840,7 +840,8 @@ static ssize_t firmware_direct_write(struct file *filp, struct kobject *kobj,
mutex_lock(&fw_lock);
fw = fw_priv->fw;
- if (!fw || test_bit(FW_STATUS_DONE, &fw_priv->buf->status)) {
+ if (!fw || !fw_priv->buf ||
+ test_bit(FW_STATUS_DONE, &fw_priv->buf->status)) {
retval = -ENODEV;
goto out;
}