From d6599adf6fa66aeca55750c2bb14619d458007e3 Mon Sep 17 00:00:00 2001 From: Ian Schram Date: Fri, 18 Sep 2009 21:26:26 +0200 Subject: [PATCH] --- yaml --- r: 163797 b: refs/heads/master c: cdf8073d6b2c6c5a3cd6ce0e6c1297157f7f99ba h: refs/heads/master i: 163795: ce5f56bf153305a9b15fa7c3ea23258ab4ca0f33 v: v3 --- [refs] | 2 +- trunk/kernel/perf_counter.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index ec1a54c24e52..d41ab0b689e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec60a3fe478c0fc6d109eb5840b435ecee4d132b +refs/heads/master: cdf8073d6b2c6c5a3cd6ce0e6c1297157f7f99ba diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index d5899b62b276..cc768ab81ac8 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -4208,8 +4208,8 @@ perf_counter_alloc(struct perf_counter_attr *attr, static int perf_copy_attr(struct perf_counter_attr __user *uattr, struct perf_counter_attr *attr) { - int ret; u32 size; + int ret; if (!access_ok(VERIFY_WRITE, uattr, PERF_ATTR_SIZE_VER0)) return -EFAULT; @@ -4234,19 +4234,19 @@ static int perf_copy_attr(struct perf_counter_attr __user *uattr, /* * If we're handed a bigger struct than we know of, - * ensure all the unknown bits are 0. + * ensure all the unknown bits are 0 - i.e. new + * user-space does not rely on any kernel feature + * extensions we dont know about yet. */ if (size > sizeof(*attr)) { - unsigned long val; - unsigned long __user *addr; - unsigned long __user *end; + unsigned char __user *addr; + unsigned char __user *end; + unsigned char val; - addr = PTR_ALIGN((void __user *)uattr + sizeof(*attr), - sizeof(unsigned long)); - end = PTR_ALIGN((void __user *)uattr + size, - sizeof(unsigned long)); + addr = (void __user *)uattr + sizeof(*attr); + end = (void __user *)uattr + size; - for (; addr < end; addr += sizeof(unsigned long)) { + for (; addr < end; addr++) { ret = get_user(val, addr); if (ret) return ret;