Skip to content

Commit c7cc920

Browse files
edumazetkuba-moo
authored andcommitted
macsec: avoid use-after-free in macsec_handle_frame()
De-referencing skb after call to gro_cells_receive() is not allowed. We need to fetch skb->len earlier. Fixes: 5491e7c ("macsec: enable GRO and RPS on macsec devices") Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Paolo Abeni <pabeni@redhat.com> Acked-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 47dda78 commit c7cc920

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/net/macsec.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1077,6 +1077,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)
10771077
struct macsec_rx_sa *rx_sa;
10781078
struct macsec_rxh_data *rxd;
10791079
struct macsec_dev *macsec;
1080+
unsigned int len;
10801081
sci_t sci;
10811082
u32 hdr_pn;
10821083
bool cbit;
@@ -1232,9 +1233,10 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)
12321233
macsec_rxsc_put(rx_sc);
12331234

12341235
skb_orphan(skb);
1236+
len = skb->len;
12351237
ret = gro_cells_receive(&macsec->gro_cells, skb);
12361238
if (ret == NET_RX_SUCCESS)
1237-
count_rx(dev, skb->len);
1239+
count_rx(dev, len);
12381240
else
12391241
macsec->secy.netdev->stats.rx_dropped++;
12401242

0 commit comments

Comments
 (0)