lkml.org 
[lkml]   [2012]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 176/270] use clamp_t in UNAME26 fix
    Date
    3.5.7u1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kees Cook <keescook@chromium.org>

    commit 31fd84b95eb211d5db460a1dda85e004800a7b52 upstream.

    The min/max call needed to have explicit types on some architectures
    (e.g. mn10300). Use clamp_t instead to avoid the warning:

    kernel/sys.c: In function 'override_release':
    kernel/sys.c:1287:10: warning: comparison of distinct pointer types lacks a cast [enabled by default]

    Reported-by: Fengguang Wu <fengguang.wu@intel.com>
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    kernel/sys.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/sys.c b/kernel/sys.c
    index 1b66408..b6fe559 100644
    --- a/kernel/sys.c
    +++ b/kernel/sys.c
    @@ -1284,7 +1284,7 @@ static int override_release(char __user *release, size_t len)
    rest++;
    }
    v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
    - copy = min(sizeof(buf), max_t(size_t, 1, len));
    + copy = clamp_t(size_t, len, 1, sizeof(buf));
    copy = scnprintf(buf, copy, "2.6.%u%s", v, rest);
    ret = copy_to_user(release, buf, copy + 1);
    }
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-11-26 19:01    [W:4.075 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site