reset: fix null pointer dereference on dev by dev_name

The call to dev_name will dereference dev, however, dev is later
being null checked, so there is a possibility of a null pointer
dereference on dev by the call to dev_name. Fix this by null
checking dev first before the call to dev_name

Detected by CoverityScan, CID#1475475 ("Dereference before null check")

Fixes: 2a6cb2b1d83b ("reset: Add reset_control_get_count()")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Colin Ian King 2018-11-14 21:49:35 +00:00 committed by Philipp Zabel
parent eaf91db0ab
commit 151f72f493
1 changed files with 2 additions and 1 deletions

View File

@ -799,12 +799,13 @@ EXPORT_SYMBOL_GPL(devm_reset_control_array_get);
static int reset_control_get_count_from_lookup(struct device *dev) static int reset_control_get_count_from_lookup(struct device *dev)
{ {
const struct reset_control_lookup *lookup; const struct reset_control_lookup *lookup;
const char *dev_id = dev_name(dev); const char *dev_id;
int count = 0; int count = 0;
if (!dev) if (!dev)
return -EINVAL; return -EINVAL;
dev_id = dev_name(dev);
mutex_lock(&reset_lookup_mutex); mutex_lock(&reset_lookup_mutex);
list_for_each_entry(lookup, &reset_lookup_list, list) { list_for_each_entry(lookup, &reset_lookup_list, list) {