lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 100/122] net: Fix references to out-of-scope variables in put_cmsg_compat()
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.5-stable review patch. If anyone has any objections, please let me know.

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


    From: Jesper Juhl <jj@chaosbits.net>

    [ Upstream commit 818810472b129004c16fc51bf0a570b60776bfb7 ]

    In net/compat.c::put_cmsg_compat() we may assign 'data' the address of
    either the 'ctv' or 'cts' local variables inside the 'if
    (!COMPAT_USE_64BIT_TIME)' branch.

    Those variables go out of scope at the end of the 'if' statement, so
    when we use 'data' further down in 'copy_to_user(CMSG_COMPAT_DATA(cm),
    data, cmlen - sizeof(struct compat_cmsghdr))' there's no telling what
    it may be refering to - not good.

    Fix the problem by simply giving 'ctv' and 'cts' function scope.

    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/compat.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/net/compat.c
    +++ b/net/compat.c
    @@ -221,6 +221,8 @@ int put_cmsg_compat(struct msghdr *kmsg,
    {
    struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
    struct compat_cmsghdr cmhdr;
    + struct compat_timeval ctv;
    + struct compat_timespec cts[3];
    int cmlen;

    if (cm == NULL || kmsg->msg_controllen < sizeof(*cm)) {
    @@ -229,8 +231,6 @@ int put_cmsg_compat(struct msghdr *kmsg,
    }

    if (!COMPAT_USE_64BIT_TIME) {
    - struct compat_timeval ctv;
    - struct compat_timespec cts[3];
    if (level == SOL_SOCKET && type == SCM_TIMESTAMP) {
    struct timeval *tv = (struct timeval *)data;
    ctv.tv_sec = tv->tv_sec;



    \
     
     \ /
      Last update: 2012-08-08 01:21    [W:0.025 / U:60.472 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site