]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: socionext: fix possible user-after-free in netsec_process_rx
authorLorenzo Bianconi <lorenzo@kernel.org>
Sat, 25 Jan 2020 11:48:50 +0000 (12:48 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 27 Jan 2020 10:05:42 +0000 (11:05 +0100)
Fix possible use-after-free in in netsec_process_rx that can occurs if
the first packet is sent to the normal networking stack and the
following one is dropped by the bpf program attached to the xdp hook.
Fix the issue defining the skb pointer in the 'budget' loop

Fixes: ba2b232108d3c ("net: netsec: add XDP support")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/socionext/netsec.c

index 495f6cfdbd91c96d63cccab06567b194015d7692..1f685221f96cb1916bf4bf09f5c70f91af494b1d 100644 (file)
@@ -935,7 +935,6 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget)
        struct netsec_rx_pkt_info rx_info;
        enum dma_data_direction dma_dir;
        struct bpf_prog *xdp_prog;
-       struct sk_buff *skb = NULL;
        u16 xdp_xmit = 0;
        u32 xdp_act = 0;
        int done = 0;
@@ -949,6 +948,7 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget)
                struct netsec_de *de = dring->vaddr + (DESC_SZ * idx);
                struct netsec_desc *desc = &dring->desc[idx];
                struct page *page = virt_to_page(desc->addr);
+               struct sk_buff *skb = NULL;
                u32 xdp_result = XDP_PASS;
                u16 pkt_len, desc_len;
                dma_addr_t dma_handle;