lkml.org 
[lkml]   [2011]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [29/98] can: Add missing socket check in can/bcm release.
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: Dave Jones <davej@redhat.com>

    commit c6914a6f261aca0c9f715f883a353ae7ff51fe83 upstream.

    We can get here with a NULL socket argument passed from userspace,
    so we need to handle it accordingly.

    Signed-off-by: Dave Jones <davej@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    net/can/bcm.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    Index: linux-2.6.35.y/net/can/bcm.c
    ===================================================================
    --- linux-2.6.35.y.orig/net/can/bcm.c
    +++ linux-2.6.35.y/net/can/bcm.c
    @@ -1424,9 +1424,14 @@ static int bcm_init(struct sock *sk)
    static int bcm_release(struct socket *sock)
    {
    struct sock *sk = sock->sk;
    - struct bcm_sock *bo = bcm_sk(sk);
    + struct bcm_sock *bo;
    struct bcm_op *op, *next;

    + if (sk == NULL)
    + return 0;
    +
    + bo = bcm_sk(sk);
    +
    /* remove bcm_ops, timer, rx_unregister(), etc. */

    unregister_netdevice_notifier(&bo->notifier);

    \
     
     \ /
      Last update: 2011-07-27 02:41    [W:0.023 / U:0.640 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site