Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c13a936f authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

net: stmmac: use correct DMA buffer size in the RX descriptor 



[ Upstream commit 583e6361414903c5206258a30e5bd88cb03c0254 ]

We always program the maximum DMA buffer size into the receive descriptor,
although the allocated size may be less. E.g. with the default MTU size
we allocate only 1536 bytes. If somebody sends us a bigger frame, then
memory may get corrupted.

Fix by using exact buffer sizes.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 824451fd

drivers/net/ethernet/stmicro/stmmac/descs_com.h

+14 −8
Original line number Diff line number Diff line
@@ -29,8 +29,10 @@ 
/* Specific functions used for Ring mode */



/* Enhanced descriptors */

static inline void ehn_desc_rx_set_on_ring(struct dma_desc *p, int end)

static inline void ehn_desc_rx_set_on_ring(struct dma_desc *p, int end,

					   int bfsize)

{

	if (bfsize == BUF_SIZE_16KiB)

		p->des1 |= cpu_to_le32((BUF_SIZE_8KiB

				<< ERDES1_BUFFER2_SIZE_SHIFT)

			   & ERDES1_BUFFER2_SIZE_MASK);
@@ -59,11 +61,15 @@ static inline void enh_set_tx_desc_len_on_ring(struct dma_desc *p, int len) 
}



/* Normal descriptors */

static inline void ndesc_rx_set_on_ring(struct dma_desc *p, int end)

static inline void ndesc_rx_set_on_ring(struct dma_desc *p, int end, int bfsize)

{

	p->des1 |= cpu_to_le32(((BUF_SIZE_2KiB - 1)

				<< RDES1_BUFFER2_SIZE_SHIFT)

	if (bfsize >= BUF_SIZE_2KiB) {

		int bfsize2;



		bfsize2 = min(bfsize - BUF_SIZE_2KiB + 1, BUF_SIZE_2KiB - 1);

		p->des1 |= cpu_to_le32((bfsize2 << RDES1_BUFFER2_SIZE_SHIFT)

			    & RDES1_BUFFER2_SIZE_MASK);

	}



	if (end)

		p->des1 |= cpu_to_le32(RDES1_END_RING);

drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static int dwmac4_wrback_get_rx_timestamp_status(void *desc, void *next_desc, 
}



static void dwmac4_rd_init_rx_desc(struct dma_desc *p, int disable_rx_ic,

				   int mode, int end)

				   int mode, int end, int bfsize)

{

	dwmac4_set_rx_owner(p, disable_rx_ic);

}

drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static int dwxgmac2_get_rx_timestamp_status(void *desc, void *next_desc, 
}



static void dwxgmac2_init_rx_desc(struct dma_desc *p, int disable_rx_ic,

				  int mode, int end)

				  int mode, int end, int bfsize)

{

	dwxgmac2_set_rx_owner(p, disable_rx_ic);

}

drivers/net/ethernet/stmicro/stmmac/enh_desc.c

+7 −3
Original line number Diff line number Diff line
@@ -259,15 +259,19 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x, 
}



static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic,

				  int mode, int end)

				  int mode, int end, int bfsize)

{

	int bfsize1;



	p->des0 |= cpu_to_le32(RDES0_OWN);

	p->des1 |= cpu_to_le32(BUF_SIZE_8KiB & ERDES1_BUFFER1_SIZE_MASK);



	bfsize1 = min(bfsize, BUF_SIZE_8KiB);

	p->des1 |= cpu_to_le32(bfsize1 & ERDES1_BUFFER1_SIZE_MASK);



	if (mode == STMMAC_CHAIN_MODE)

		ehn_desc_rx_set_on_chain(p);

	else

		ehn_desc_rx_set_on_ring(p, end);

		ehn_desc_rx_set_on_ring(p, end, bfsize);



	if (disable_rx_ic)

		p->des1 |= cpu_to_le32(ERDES1_DISABLE_IC);

drivers/net/ethernet/stmicro/stmmac/hwif.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct dma_extended_desc; 
struct stmmac_desc_ops {

	/* DMA RX descriptor ring initialization */

	void (*init_rx_desc)(struct dma_desc *p, int disable_rx_ic, int mode,

			int end);

			int end, int bfsize);

	/* DMA TX descriptor ring initialization */

	void (*init_tx_desc)(struct dma_desc *p, int mode, int end);

	/* Invoked by the xmit function to prepare the tx descriptor */