From a168222d4a85a927528e19ec6324cee1385e4d3b Mon Sep 17 00:00:00 2001 From: Varun Wadekar Date: Mon, 7 Apr 2014 12:21:22 +0530 Subject: security: tlk: abort driver init if dev->req_param_buf is NULL During driver init, we allocate memory for dev->req_param_buf if the secure firmware supports the new way of accessing request params. We need to check that dev->req_param_buf was allocated before using it. Change-Id: I796255274937f46fe01aeb1f5372c23bae830b85 Signed-off-by: Varun Wadekar Reviewed-on: http://git-master/r/393218 GVS: Gerrit_Virtual_Submit Reviewed-by: Bharat Nihalani --- security/tlk_driver/ote_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'security') diff --git a/security/tlk_driver/ote_device.c b/security/tlk_driver/ote_device.c index bfc59d3cb94c..d7dfd7a94d6f 100644 --- a/security/tlk_driver/ote_device.c +++ b/security/tlk_driver/ote_device.c @@ -76,7 +76,7 @@ static int te_create_free_cmd_list(struct tlk_device *dev) &dev->param_addr_phys, GFP_KERNEL); } - if ((dev->req_addr == NULL) || (dev->param_addr == NULL)) { + if (!dev->req_addr || !dev->param_addr || !dev->req_param_buf) { ret = -ENOMEM; goto error; } -- cgit v1.2.3