macsec: avoid use-after-free in macsec_handle_frame()
commit5.4-rM2-2.2.x-imx-squashedc7cc9200e9
upstream. De-referencing skb after call to gro_cells_receive() is not allowed. We need to fetch skb->len earlier. Fixes:5491e7c6b1
("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
20f96fee81
commit
1317469fa0
|
@ -1080,6 +1080,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)
|
||||||
struct macsec_rx_sa *rx_sa;
|
struct macsec_rx_sa *rx_sa;
|
||||||
struct macsec_rxh_data *rxd;
|
struct macsec_rxh_data *rxd;
|
||||||
struct macsec_dev *macsec;
|
struct macsec_dev *macsec;
|
||||||
|
unsigned int len;
|
||||||
sci_t sci;
|
sci_t sci;
|
||||||
u32 pn;
|
u32 pn;
|
||||||
bool cbit;
|
bool cbit;
|
||||||
|
@ -1236,9 +1237,10 @@ deliver:
|
||||||
macsec_rxsc_put(rx_sc);
|
macsec_rxsc_put(rx_sc);
|
||||||
|
|
||||||
skb_orphan(skb);
|
skb_orphan(skb);
|
||||||
|
len = skb->len;
|
||||||
ret = gro_cells_receive(&macsec->gro_cells, skb);
|
ret = gro_cells_receive(&macsec->gro_cells, skb);
|
||||||
if (ret == NET_RX_SUCCESS)
|
if (ret == NET_RX_SUCCESS)
|
||||||
count_rx(dev, skb->len);
|
count_rx(dev, len);
|
||||||
else
|
else
|
||||||
macsec->secy.netdev->stats.rx_dropped++;
|
macsec->secy.netdev->stats.rx_dropped++;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue