Commit 91c15a78 authored by Miquel Raynal's avatar Miquel Raynal Committed by Zhengchao Shao
Browse files

net: ieee802154: at86rf230: Stop leaking skb's 

stable inclusion
from stable-v4.19.231
commit 6312f6a53fd3ea38125dcaca5e3c9aa7d8a60cf7
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IADG4I
CVE: CVE-2022-48794

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6312f6a53fd3ea38125dcaca5e3c9aa7d8a60cf7



---------------------------

[ Upstream commit e5ce576d ]

Upon error the ieee802154_xmit_complete() helper is not called. Only
ieee802154_wake_queue() is called manually. In the Tx case we then leak
the skb structure.

Free the skb structure upon error before returning when appropriate.

As the 'is_tx = 0' cannot be moved in the complete handler because of a
possible race between the delay in switching to STATE_RX_AACK_ON and a
new interrupt, we introduce an intermediate 'was_tx' boolean just for
this purpose.

There is no Fixes tag applying here, many changes have been made on this
area and the issue kind of always existed.

Suggested-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Acked-by: default avatarAlexander Aring <aahringo@redhat.com>
Link: https://lore.kernel.org/r/20220125121426.848337-4-miquel.raynal@bootlin.com


Signed-off-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
parent 8d2f09e2

drivers/net/ieee802154/at86rf230.c

+11 −2
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ struct at86rf230_local { 
	unsigned long cal_timeout;

	bool is_tx;

	bool is_tx_from_off;

	bool was_tx;

	u8 tx_retry;

	struct sk_buff *tx_skb;

	struct at86rf230_state_change tx;
@@ -351,8 +352,12 @@ at86rf230_async_error_recover_complete(void *context) 
	if (ctx->free)

		kfree(ctx);



	if (lp->was_tx) {

		lp->was_tx = 0;

		dev_kfree_skb_any(lp->tx_skb);

		ieee802154_wake_queue(lp->hw);

	}

}



static void

at86rf230_async_error_recover(void *context)
@@ -360,7 +365,11 @@ at86rf230_async_error_recover(void *context) 
	struct at86rf230_state_change *ctx = context;

	struct at86rf230_local *lp = ctx->lp;



	if (lp->is_tx) {

		lp->was_tx = 1;

		lp->is_tx = 0;

	}



	at86rf230_async_state_change(lp, ctx, STATE_RX_AACK_ON,

				     at86rf230_async_error_recover_complete);

}