lkml.org 
[lkml]   [2011]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[18/26] next_pidmap: fix overflow condition
    2.6.33-longterm review patch.  If anyone has any objections, please let us know.

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

    From: Linus Torvalds <torvalds@linux-foundation.org>

    commit c78193e9c7bcbf25b8237ad0dec82f805c4ea69b upstream.

    next_pidmap() just quietly accepted whatever 'last' pid that was passed
    in, which is not all that safe when one of the users is /proc.

    Admittedly the proc code should do some sanity checking on the range
    (and that will be the next commit), but that doesn't mean that the
    helper functions should just do that pidmap pointer arithmetic without
    checking the range of its arguments.

    So clamp 'last' to PID_MAX_LIMIT. The fact that we then do "last+1"
    doesn't really matter, the for-loop does check against the end of the
    pidmap array properly (it's only the actual pointer arithmetic overflow
    case we need to worry about, and going one bit beyond isn't going to
    overflow).

    [ Use PID_MAX_LIMIT rather than pid_max as per Eric Biederman ]

    Reported-by: Tavis Ormandy <taviso@cmpxchg8b.com>
    Analyzed-by: Robert Święcki <robert@swiecki.net>
    Cc: Eric W. Biederman <ebiederm@xmission.com>
    Cc: Pavel Emelyanov <xemul@openvz.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    include/linux/pid.h | 2 +-
    kernel/pid.c | 5 ++++-
    2 files changed, 5 insertions(+), 2 deletions(-)

    --- a/include/linux/pid.h
    +++ b/include/linux/pid.h
    @@ -117,7 +117,7 @@ extern struct pid *find_vpid(int nr);
    */
    extern struct pid *find_get_pid(int nr);
    extern struct pid *find_ge_pid(int nr, struct pid_namespace *);
    -int next_pidmap(struct pid_namespace *pid_ns, int last);
    +int next_pidmap(struct pid_namespace *pid_ns, unsigned int last);

    extern struct pid *alloc_pid(struct pid_namespace *ns);
    extern void free_pid(struct pid *pid);
    --- a/kernel/pid.c
    +++ b/kernel/pid.c
    @@ -183,11 +183,14 @@ static int alloc_pidmap(struct pid_names
    return -1;
    }

    -int next_pidmap(struct pid_namespace *pid_ns, int last)
    +int next_pidmap(struct pid_namespace *pid_ns, unsigned int last)
    {
    int offset;
    struct pidmap *map, *end;

    + if (last >= PID_MAX_LIMIT)
    + return -1;
    +
    offset = (last + 1) & BITS_PER_PAGE_MASK;
    map = &pid_ns->pidmap[(last + 1)/BITS_PER_PAGE];
    end = &pid_ns->pidmap[PIDMAP_ENTRIES];

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-04-19 23:09    [W:0.026 / U:1.764 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site