Commit 9c79a8ab authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jakub Kicinski
Browse files

net: mvneta: fix possible memory leak in mvneta_swbm_add_rx_fragment 



Recycle the page running page_pool_put_full_page() in
mvneta_swbm_add_rx_fragment routine when the last descriptor
contains just the FCS or if the received packet contains more than
MAX_SKB_FRAGS fragments

Fixes: ca0e0146 ("net: mvneta: move skb build after descriptors processing")
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://lore.kernel.org/r/df6a2bad70323ee58d3901491ada31c1ca2a40b9.1605291228.git.lorenzo@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8e5debed

drivers/net/ethernet/marvell/mvneta.c

+3 −2
Original line number Diff line number Diff line
@@ -2287,6 +2287,7 @@ mvneta_swbm_add_rx_fragment(struct mvneta_port *pp, 
	dma_sync_single_for_cpu(dev->dev.parent,

				rx_desc->buf_phys_addr,

				len, dma_dir);

	rx_desc->buf_phys_addr = 0;



	if (data_len > 0 && sinfo->nr_frags < MAX_SKB_FRAGS) {

		skb_frag_t *frag = &sinfo->frags[sinfo->nr_frags];
@@ -2295,8 +2296,8 @@ mvneta_swbm_add_rx_fragment(struct mvneta_port *pp, 
		skb_frag_size_set(frag, data_len);

		__skb_frag_set_page(frag, page);

		sinfo->nr_frags++;



		rx_desc->buf_phys_addr = 0;

	} else {

		page_pool_put_full_page(rxq->page_pool, page, true);

	}

	*size -= len;

}