p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

usb: typec: unlock dp->lock on error exit path, and also zero ret if successful 

One of the error handling paths forgets to unlock dp->lock on the error
exit path leading to a potential lock-up.  Also the return path for a
successful call to the function configuration_store can return an
uninitialized error return code if dp->alt->active is false, so ensure
ret is zeroed on the successful exit path to avoid garbage being returned.

Detected by CoverityScan, CID#1471597 ("Unitialized scalar variable")

Fixes: 0e3bb7d689 ("usb: typec: Add driver for DisplayPort alternate mode")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Colin Ian King 2018-07-05 14:36:47 +01:00 committed by Greg Kroah-Hartman
parent 11b71782c1
commit 98a1a0c7a3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/typec/altmodes/displayport.c
View File

@ -333,7 +333,7 @@ configuration_store(struct device *dev, struct device_attribute *attr,
u32 conf; u32 conf;
u32 cap; u32 cap;
int con; int con;
int ret; int ret = 0;
con = sysfs_match_string(configurations, buf); con = sysfs_match_string(configurations, buf);
if (con < 0) if (con < 0)
@ -349,8 +349,10 @@ configuration_store(struct device *dev, struct device_attribute *attr,
cap = DP_CAP_CAPABILITY(dp->alt->vdo); cap = DP_CAP_CAPABILITY(dp->alt->vdo);
if ((con == DP_CONF_DFP_D && !(cap & DP_CAP_DFP_D)) || if ((con == DP_CONF_DFP_D && !(cap & DP_CAP_DFP_D)) ||
(con == DP_CONF_UFP_D && !(cap & DP_CAP_UFP_D))) (con == DP_CONF_UFP_D && !(cap & DP_CAP_UFP_D))) {
return -EINVAL; ret = -EINVAL;
goto err_unlock;
}
conf = dp->data.conf & ~DP_CONF_DUAL_D; conf = dp->data.conf & ~DP_CONF_DUAL_D;
conf |= con; conf |= con;