From 7fec03a2c02205ce259753cba1edfa44d79ce6d2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 25 Jun 2006 05:47:35 -0700 Subject: [PATCH] --- yaml --- r: 29691 b: refs/heads/master c: 0928d68056fa25456830b1de9f0ee89bc37447cd h: refs/heads/master i: 29689: 7f66410c8179924c2c335fd6576ba91f376154df 29687: fb0d8d2c3c39071a62a315edf99238385f4acfb2 v: v3 --- [refs] | 2 +- trunk/fs/openpromfs/inode.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9c907592a748..d7a6d323f6d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e6113908fe76a06295cb243f1f2f0eea055b0c2 +refs/heads/master: 0928d68056fa25456830b1de9f0ee89bc37447cd diff --git a/trunk/fs/openpromfs/inode.c b/trunk/fs/openpromfs/inode.c index 464e2bce0203..c0cbe97cdc60 100644 --- a/trunk/fs/openpromfs/inode.c +++ b/trunk/fs/openpromfs/inode.c @@ -448,10 +448,11 @@ static ssize_t property_write(struct file *filp, const char __user *buf, *q |= simple_strtoul (tmp, NULL, 16); buf += last_cnt; } else { - char tchars[17]; /* XXX yuck... */ + char tchars[2 * sizeof(long) + 1]; - if (copy_from_user(tchars, buf, 16)) + if (copy_from_user(tchars, buf, sizeof(tchars) - 1)) return -EFAULT; + tchars[sizeof(tchars) - 1] = '\0'; *q = simple_strtoul (tchars, NULL, 16); buf += 9; }