lkml.org 
[lkml]   [2015]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 24/45] net/neighbour: fix crash at dumping device-agnostic proxy entries
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

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

    From: Konstantin Khlebnikov <koct9i@gmail.com>

    [ Upstream commit 6adc5fd6a142c6e2c80574c1db0c7c17dedaa42e ]

    Proxy entries could have null pointer to net-device.

    Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com>
    Fixes: 84920c1420e2 ("net: Allow ipv6 proxies and arp proxies be shown with iproute2")
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/core/neighbour.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/net/core/neighbour.c
    +++ b/net/core/neighbour.c
    @@ -2207,7 +2207,7 @@ static int pneigh_fill_info(struct sk_bu
    ndm->ndm_pad2 = 0;
    ndm->ndm_flags = pn->flags | NTF_PROXY;
    ndm->ndm_type = RTN_UNICAST;
    - ndm->ndm_ifindex = pn->dev->ifindex;
    + ndm->ndm_ifindex = pn->dev ? pn->dev->ifindex : 0;
    ndm->ndm_state = NUD_NONE;

    if (nla_put(skb, NDA_DST, tbl->key_len, pn->key))
    @@ -2282,7 +2282,7 @@ static int pneigh_dump_table(struct neig
    if (h > s_h)
    s_idx = 0;
    for (n = tbl->phash_buckets[h], idx = 0; n; n = n->next) {
    - if (dev_net(n->dev) != net)
    + if (pneigh_net(n) != net)
    continue;
    if (idx < s_idx)
    goto next;



    \
     
     \ /
      Last update: 2015-12-12 21:01    [W:2.758 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site