| Message ID | 20231019070750.17911-1-dmantipov@yandex.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 173b0fb47c3dbd1e489cb449422c1037076a66d7 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: rt2x00: simplify rt2x00crypto_rx_insert_iv() | expand |
Dmitry Antipov <dmantipov@yandex.ru> wrote: > 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> Patch applied to wireless-next.git, thanks. 173b0fb47c3d wifi: rt2x00: simplify rt2x00crypto_rx_insert_iv()
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,
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> --- drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)