lkml.org 
[lkml]   [2009]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 7/9] net: Make the copy length in af_packet sockopt handler unsigned

    2.6.27-stable review patch. If anyone has any objections, please let us know.

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

    From: Arjan van de Ven <arjan@linux.intel.com>

    fixed upstream in commit b7058842c940ad2c08dd829b21e5c92ebe3b8758 in a different way

    The length of the to-copy data structure is currently stored in
    a signed integer. However many comparisons are done with sizeof(..)
    which is unsigned. It's more suitable for this variable to be unsigned
    to make these comparisons more naturally right.

    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Cc: David S. Miller <davem@davemloft.net>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    net/packet/af_packet.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/net/packet/af_packet.c
    +++ b/net/packet/af_packet.c
    @@ -1500,7 +1500,7 @@ packet_setsockopt(struct socket *sock, i
    static int packet_getsockopt(struct socket *sock, int level, int optname,
    char __user *optval, int __user *optlen)
    {
    - int len;
    + unsigned int len;
    int val;
    struct sock *sk = sock->sk;
    struct packet_sock *po = pkt_sk(sk);
    @@ -1513,7 +1513,7 @@ static int packet_getsockopt(struct sock
    if (get_user(len, optlen))
    return -EFAULT;

    - if (len < 0)
    + if ((int)len < 0)
    return -EINVAL;

    switch(optname) {



    \
     
     \ /
      Last update: 2009-10-02 01:25    [W:0.023 / U:1.196 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site