summaryrefslogtreecommitdiff
path: root/drivers/media/video/tegra/as364x.c
diff options
context:
space:
mode:
authorShreshtha Sahu <ssahu@nvidia.com>2013-08-01 16:14:59 +0530
committerMatthew Pedro <mapedro@nvidia.com>2013-08-07 10:09:49 -0700
commitaf42f432f683430df34a2a2ba084492daaae0a5c (patch)
tree8fa47c7ce091efab1add28f0eca6d34961dfc4ee /drivers/media/video/tegra/as364x.c
parentb358015d5dc66e1c2de23f68aeb6b53d485f1365 (diff)
media: video: tegra: fix miscdevice registeration nametegra-l4t-r17.1tegra-l4t-r17-17r1
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 <ssahu@nvidia.com> Reviewed-on: http://git-master/r/256818 GVS: Gerrit_Virtual_Submit Reviewed-by: Kiran Adduri <kadduri@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
Diffstat (limited to 'drivers/media/video/tegra/as364x.c')
-rw-r--r--drivers/media/video/tegra/as364x.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/media/video/tegra/as364x.c b/drivers/media/video/tegra/as364x.c
index fc459fb364a2..49d86f04e50c 100644
--- a/drivers/media/video/tegra/as364x.c
+++ b/drivers/media/video/tegra/as364x.c
@@ -150,6 +150,7 @@ struct as364x_info {
u8 led_num;
u8 led_mask;
bool shutdown_complete;
+ char devname[16];
};
static struct as364x_platform_data as364x_default_pdata = {
@@ -1180,7 +1181,6 @@ static int as364x_probe(
const struct i2c_device_id *id)
{
struct as364x_info *info;
- char dname[16];
int err;
dev_dbg(&client->dev, "%s\n", __func__);
@@ -1234,19 +1234,20 @@ static int as364x_probe(
__func__, info->regs.dev_id);
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, "as364x");
+ strncpy(info->devname, "as364x", 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 = &as364x_fileops;
info->miscdev.minor = MISC_DYNAMIC_MINOR;
if (misc_register(&info->miscdev)) {
dev_err(&client->dev, "%s unable to register misc device %s\n",
- __func__, dname);
+ __func__, info->devname);
as364x_del(info);
return -ENODEV;
}