From af42f432f683430df34a2a2ba084492daaae0a5c Mon Sep 17 00:00:00 2001 From: Shreshtha Sahu Date: Thu, 1 Aug 2013 16:14:59 +0530 Subject: media: video: tegra: fix miscdevice registeration name Allocate driver name string in info struct, rather than passing a pointer to a stack allocated array when registering a miscdevice. This prevents 'cat /proc/misc' from dereferencing a dangling pointer. Drivers of following devices were updated - ad5816, as364x, dw9718, imx091, max77387, max77665-flash, ov5693, ov9772, sh532u, ssl3250a and tps61050. Change-Id: I2344e6fefabdeda962ea33bc10803881e07ab3f0 Signed-off-by: Shreshtha Sahu Reviewed-on: http://git-master/r/256818 GVS: Gerrit_Virtual_Submit Reviewed-by: Kiran Adduri Reviewed-by: Bharat Nihalani Reviewed-by: Matthew Pedro --- drivers/media/video/tegra/ad5816.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'drivers/media/video/tegra/ad5816.c') diff --git a/drivers/media/video/tegra/ad5816.c b/drivers/media/video/tegra/ad5816.c index bddd923c6a1f..5a9bd902b5c9 100644 --- a/drivers/media/video/tegra/ad5816.c +++ b/drivers/media/video/tegra/ad5816.c @@ -124,6 +124,7 @@ struct ad5816_info { int pwr_dev; s32 pos; u16 dev_id; + char devname[16]; }; /** @@ -777,7 +778,6 @@ static int ad5816_probe( const struct i2c_device_id *id) { struct ad5816_info *info; - char dname[16]; int err; dev_dbg(&client->dev, "%s\n", __func__); @@ -835,20 +835,21 @@ static int ad5816_probe( ad5816_sdata_init(info); if (info->pdata->dev_name != 0) - strcpy(dname, info->pdata->dev_name); + strncpy(info->devname, info->pdata->dev_name, + sizeof(info->devname) - 1); else - strcpy(dname, "ad5816"); + strncpy(info->devname, "ad5816", sizeof(info->devname) - 1); if (info->pdata->num) - snprintf(dname, sizeof(dname), - "%s.%u", dname, info->pdata->num); + snprintf(info->devname, sizeof(info->devname), + "%s.%u", info->devname, info->pdata->num); - info->miscdev.name = dname; + info->miscdev.name = info->devname; info->miscdev.fops = &ad5816_fileops; info->miscdev.minor = MISC_DYNAMIC_MINOR; if (misc_register(&info->miscdev)) { dev_err(info->dev, "%s unable to register misc device %s\n", - __func__, dname); + __func__, info->devname); ad5816_del(info); return -ENODEV; } -- cgit v1.2.3