summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorXi Wang <xi.wang@gmail.com>2013-02-07 12:31:54 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-14 15:26:31 +1100
commit28b692a5ff80ec50a04e27ac60babeb45974cfc0 (patch)
tree5ef0446378f282ba2abdc7fd00079a7c17d58b1d /kernel
parentc9711f29fbd90e966320999553187fce0e545abc (diff)
sysctl: fix null checking in bin_dn_node_address()
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> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'kernel')
-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 b669ca1fa103..8ce70e518fa0 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -1193,9 +1193,10 @@ static ssize_t bin_dn_node_address(struct file *file,
/* Convert the decnet address to binary */
result = -EIO;
- nodep = strchr(buf, '.') + 1;
+ nodep = strchr(buf, '.');
if (!nodep)
goto out;
+ ++nodep;
area = simple_strtoul(buf, NULL, 10);
node = simple_strtoul(nodep, NULL, 10);