mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
b704c537cf
This is an automatically generated commit which aids following Kernel patch history, as git will see the move and copy as a rename thus defeating the purpose. For the original discussion see: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html Signed-off-by: Martin Schiller <ms@dev.tdt.de>
28 lines
999 B
Diff
28 lines
999 B
Diff
From c9c3b1775f80fa21f5bff874027d2ccb10f5d90c Mon Sep 17 00:00:00 2001
|
|
From: Aleksander Jan Bajkowski <olek2@wp.pl>
|
|
Date: Wed, 24 Aug 2022 23:54:08 +0200
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/net/ethernet/lantiq_xrx200.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/drivers/net/ethernet/lantiq_xrx200.c
|
|
+++ b/drivers/net/ethernet/lantiq_xrx200.c
|
|
@@ -193,6 +193,7 @@ static int xrx200_alloc_buf(struct xrx20
|
|
|
|
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;
|
|
}
|