diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-08-27 18:28:19 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-27 18:28:18 -0700 |
| commit | bd6e0c58e7c27d09ce06096c6019d6df38a08bc9 (patch) | |
| tree | c8aba73275dcf5b4e6ec39336454c2845037f80a | |
| parent | 697b92b1d2bd1ae461076f66b9439a66f58a40e1 (diff) | |
| parent | 6ae64f78da509c5282ef14ce6491b38cd37a444b (diff) | |
Merge "msm: ais: Fix out-of-bounds read in string class name"
| -rw-r--r-- | drivers/media/platform/msm/ais/jpeg_10/msm_jpeg_dev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/ais/jpeg_10/msm_jpeg_dev.c b/drivers/media/platform/msm/ais/jpeg_10/msm_jpeg_dev.c index 88c822c50491..2e3b4fe6b025 100644 --- a/drivers/media/platform/msm/ais/jpeg_10/msm_jpeg_dev.c +++ b/drivers/media/platform/msm/ais/jpeg_10/msm_jpeg_dev.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -32,6 +32,8 @@ #define MSM_JPEG_NAME "jpeg" #define DEV_NAME_LEN 10 +static char devname[DEV_NAME_LEN]; + static int msm_jpeg_open(struct inode *inode, struct file *filp) { int rc = 0; @@ -185,7 +187,6 @@ static int msm_jpeg_init_dev(struct platform_device *pdev) struct msm_jpeg_device *msm_jpeg_device_p; const struct of_device_id *device_id; const struct msm_jpeg_priv_data *priv_data; - char devname[DEV_NAME_LEN]; msm_jpeg_device_p = kzalloc(sizeof(struct msm_jpeg_device), GFP_ATOMIC); if (!msm_jpeg_device_p) { |