summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAleksander Jan Bajkowski <olek2@wp.pl>2022-08-25 00:54:08 +0300
committerJakub Kicinski <kuba@kernel.org>2022-08-25 22:41:39 +0300
commitc9c3b1775f80fa21f5bff874027d2ccb10f5d90c (patch)
tree0cf00b5ba91a14b954cf0529123230d8cfae9a51 /drivers
parentc4b6e9341f930e4dd089231c0414758f5f1f9dbd (diff)
downloadlinux-c9c3b1775f80fa21f5bff874027d2ccb10f5d90c.tar.xz
net: lantiq_xrx200: restore buffer if memory allocation failed
In a situation where memory allocation fails, an invalid buffer address is stored. When this descriptor is used again, the system panics in the build_skb() function when accessing memory. Fixes: 7ea6cd16f159 ("lantiq: net: fix duplicated skb in rx descriptor ring") Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/lantiq_xrx200.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c
index 25adce7f0c7c..57f27cc7724e 100644
--- a/drivers/net/ethernet/lantiq_xrx200.c
+++ b/drivers/net/ethernet/lantiq_xrx200.c
@@ -193,6 +193,7 @@ static int xrx200_alloc_buf(struct xrx200_chan *ch, void *(*alloc)(unsigned int
ch->rx_buff[ch->dma.desc] = alloc(priv->rx_skb_size);
if (!ch->rx_buff[ch->dma.desc]) {
+ ch->rx_buff[ch->dma.desc] = buf;
ret = -ENOMEM;
goto skip;
}