Commit 0e6223ea authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'XDP-fixes-for-socionext-driver' 



Lorenzo Bianconi says:

====================
XDP fixes for socionext driver

Fix possible user-after-in XDP rx path
Fix rx statistics accounting if no bpf program is attached
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 09917a12 02758cb6

drivers/net/ethernet/socionext/netsec.c

+2 −2
Original line number Diff line number Diff line
@@ -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,7 +948,8 @@ 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);

		u32 xdp_result = XDP_PASS;

		u32 xdp_result = NETSEC_XDP_PASS;

		struct sk_buff *skb = NULL;

		u16 pkt_len, desc_len;

		dma_addr_t dma_handle;

		struct xdp_buff xdp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE