wifi: rt2x00: simplify rt2x00crypto_rx_insert_iv()
authorDmitry Antipov <dmantipov@yandex.ru>
Thu, 19 Oct 2023 07:06:09 +0000 (10:06 +0300)
committerKalle Valo <kvalo@kernel.org>
Thu, 18 Jan 2024 13:07:19 +0000 (15:07 +0200)
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
drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c

index ad95f9eba301934525f2579cdb99a2149894fdff..1000fbfb94b86627f3727f60ea5e744de165577b 100644 (file)
@@ -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,