aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXi Wang2013-02-27 19:05:21 -0600
committerGreg Kroah-Hartman2013-03-03 16:09:04 -0600
commitd6bf427fdac5fb26636d72f04289780a0ff2ca93 (patch)
tree0239f5e4b2a01160f7a6c65fd86ac2f16c07a6af
parentcbf253c44b52b3c6b921a22f05243a1dc7a00122 (diff)
downloadkernel-common-d6bf427fdac5fb26636d72f04289780a0ff2ca93.tar.gz
kernel-common-d6bf427fdac5fb26636d72f04289780a0ff2ca93.tar.xz
kernel-common-d6bf427fdac5fb26636d72f04289780a0ff2ca93.zip
sysctl: fix null checking in bin_dn_node_address()
commit df1778be1a33edffa51d094eeda87c858ded6560 upstream. The null check of `strchr() + 1' is broken, which is always non-null, leading to OOB read. Instead, check the result of strchr(). Signed-off-by: Xi Wang <xi.wang@gmail.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/sysctl_binary.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index e055e8b533c..17c20c7563a 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -1194,9 +1194,10 @@ static ssize_t bin_dn_node_address(struct file *file,
1194 1194
1195 /* Convert the decnet address to binary */ 1195 /* Convert the decnet address to binary */
1196 result = -EIO; 1196 result = -EIO;
1197 nodep = strchr(buf, '.') + 1; 1197 nodep = strchr(buf, '.');
1198 if (!nodep) 1198 if (!nodep)
1199 goto out; 1199 goto out;
1200 ++nodep;
1200 1201
1201 area = simple_strtoul(buf, NULL, 10); 1202 area = simple_strtoul(buf, NULL, 10);
1202 node = simple_strtoul(nodep, NULL, 10); 1203 node = simple_strtoul(nodep, NULL, 10);