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

Commit bea52e4d authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

staging: mt7621-dma: fix potentially dereferencing uninitialized 'tx_desc' 



commit 354e379684fcc70ab8d5450b4d57bd92b5294dfd upstream.

Function 'mtk_hsdma_start_transfer' uses 'tx_desc' pointer which can be
dereferenced before it is initializated. Initializate pointer before
avoiding the problem.

Fixes: 0853c7a5 ("staging: mt7621-dma: ralink: add rt2880 dma engine")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6df2b837

drivers/staging/mt7621-dma/mtk-hsdma.c

+2 −1
Original line number Diff line number Diff line
@@ -335,6 +335,8 @@ static int mtk_hsdma_start_transfer(struct mtk_hsdam_engine *hsdma, 
	/* tx desc */

	src = sg->src_addr;

	for (i = 0; i < chan->desc->num_sgs; i++) {

		tx_desc = &chan->tx_ring[chan->tx_idx];



		if (len > HSDMA_MAX_PLEN)

			tlen = HSDMA_MAX_PLEN;

		else
@@ -344,7 +346,6 @@ static int mtk_hsdma_start_transfer(struct mtk_hsdam_engine *hsdma, 
			tx_desc->addr1 = src;

			tx_desc->flags |= HSDMA_DESC_PLEN1(tlen);

		} else {

			tx_desc = &chan->tx_ring[chan->tx_idx];

			tx_desc->addr0 = src;

			tx_desc->flags = HSDMA_DESC_PLEN0(tlen);