summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKumar Sanghvi <kumar.sanghvi@stericsson.com>2011-04-06 11:58:13 +0530
committerMathieu J. Poirier <mathieu.poirier@linaro.org>2011-11-10 11:12:12 -0700
commit87c3dead0945f1e805a0e3c7054c938d5a8201ce (patch)
treea8be722856d108e47be18402b252369ee91f92b6
parent1d85e95c47901fae41ffd9e64d2afca5a557ed3d (diff)
u8500:shrm: Fix null pointer dereference
Fixes null pointer dereference in shrm char interface ST-Ericsson Linux next: - ST-Ericsson ID: ER332892 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ia60fa08e61e50c2e2645e22c2d7b9c5df01df7ef Signed-off-by: Kumar Sanghvi <kumar.sanghvi@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20103 Reviewed-by: Hemant-vilas RAMDASI <hemant.ramdasi@stericsson.com> Reviewed-by: Arun MURTHY <arun.murthy@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--drivers/char/shrm_char.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/shrm_char.c b/drivers/char/shrm_char.c
index 714d38e42f1..e2aaf60674f 100644
--- a/drivers/char/shrm_char.c
+++ b/drivers/char/shrm_char.c
@@ -273,6 +273,7 @@ int get_size_of_new_msg(struct message_queue *q)
struct queue_element *new_msg = NULL;
struct list_head *msg_list;
struct shrm_dev *shrm = q->shrm;
+ int size = 0;
dev_dbg(shrm->dev, "%s IN\n", __func__);
@@ -284,12 +285,13 @@ int get_size_of_new_msg(struct message_queue *q)
dev_err(shrm->dev, "no message found\n");
return -EFAULT;
}
+ size = new_msg->size;
break;
}
spin_unlock_bh(&q->update_lock);
dev_dbg(shrm->dev, "%s OUT\n", __func__);
- return new_msg->size;
+ return size;
}
/**