summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2023-10-19 10:06:09 +0300
committerKalle Valo <kvalo@kernel.org>2024-01-18 15:07:19 +0200
commit173b0fb47c3dbd1e489cb449422c1037076a66d7 (patch)
treeaff2892a95b9620dc3fc9f5a80ce216e0eec3487
parent50180c7f8e3de7c2d87f619131776598fcb1478d (diff)
wifi: rt2x00: simplify rt2x00crypto_rx_insert_iv()
In 'rt2x00crypto_rx_insert_iv()', added alignment can't exceed 3 bytes and ICV size is either 4 or 8 bytes, so skb space adjustment may be simplified. Compile tested only. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> Signed-off-by: Kalle Valo <kvalo@kernel.org> Link: https://msgid.link/20231019070750.17911-1-dmantipov@yandex.ru
-rw-r--r--drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c b/drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c
index ad95f9eba301..1000fbfb94b8 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c
@@ -197,10 +197,7 @@ void rt2x00crypto_rx_insert_iv(struct sk_buff *skb,
transfer += header_length;
} else {
skb_push(skb, iv_len + align);
- if (align < icv_len)
- skb_put(skb, icv_len - align);
- else if (align > icv_len)
- skb_trim(skb, rxdesc->size + iv_len + icv_len);
+ skb_put(skb, icv_len - align);
/* Move ieee80211 header */
memmove(skb->data + transfer,