summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexander Shishkin <alexander.shishkin@linux.intel.com>2016-03-04 16:16:31 +0200
committerAlexander Shishkin <alexander.shishkin@linux.intel.com>2016-04-08 16:11:55 +0300
commit6575cbd67172bbcbfbb50ddd854d2b90c9f4e358 (patch)
treeafb171b15a3e11db7aaa847384753fe0a4c22741 /drivers
parent8f1127ea09a7bfe7e1b5fab5b7f52bd56f2d1bf5 (diff)
downloadop-kernel-dev-6575cbd67172bbcbfbb50ddd854d2b90c9f4e358.zip
op-kernel-dev-6575cbd67172bbcbfbb50ddd854d2b90c9f4e358.tar.gz
intel_th: msu: Handle kstrndup() failure
Currently, the nr_pages attribute store does not check if kstrndup() succeeded. Fix this. Reported-by: Alan Cox <alan.cox@intel.com> Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> Reviewed-by: Laurent Fert <laurent.fert@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwtracing/intel_th/msu.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
index d9d6022..747ccf8 100644
--- a/drivers/hwtracing/intel_th/msu.c
+++ b/drivers/hwtracing/intel_th/msu.c
@@ -1393,6 +1393,11 @@ nr_pages_store(struct device *dev, struct device_attribute *attr,
do {
end = memchr(p, ',', len);
s = kstrndup(p, end ? end - p : len, GFP_KERNEL);
+ if (!s) {
+ ret = -ENOMEM;
+ goto free_win;
+ }
+
ret = kstrtoul(s, 10, &val);
kfree(s);
OpenPOWER on IntegriCloud