lkml.org 
[lkml]   [2011]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 149/209] econet: Fix crash in aun_incoming().
    Date
    From: David S. Miller <davem@davemloft.net>

    =====================================================================
    | This is a commit scheduled for the next v2.6.34 longterm release. |
    | If you see a problem with using this for longterm, please comment.|
    =====================================================================

    commit 4e085e76cbe558b79b54cbab772f61185879bc64 upstream

    Unconditional use of skb->dev won't work here,
    try to fetch the econet device via skb_dst()->dev
    instead.

    Suggested by Eric Dumazet.

    Reported-by: Nelson Elhage <nelhage@ksplice.com>
    Tested-by: Nelson Elhage <nelhage@ksplice.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    net/econet/af_econet.c | 6 +++++-
    1 files changed, 5 insertions(+), 1 deletions(-)

    diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
    index e40e6b0..728d389 100644
    --- a/net/econet/af_econet.c
    +++ b/net/econet/af_econet.c
    @@ -847,9 +847,13 @@ static void aun_incoming(struct sk_buff *skb, struct aunhdr *ah, size_t len)
    {
    struct iphdr *ip = ip_hdr(skb);
    unsigned char stn = ntohl(ip->saddr) & 0xff;
    + struct dst_entry *dst = skb_dst(skb);
    + struct ec_device *edev = NULL;
    struct sock *sk;
    struct sk_buff *newskb;
    - struct ec_device *edev = skb->dev->ec_ptr;
    +
    + if (dst)
    + edev = dst->dev->ec_ptr;

    if (! edev)
    goto bad;
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-04-14 20:19    [W:0.020 / U:0.196 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site