Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f74e8d46 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

macsec: avoid use-after-free in macsec_handle_frame() 



commit c7cc9200e9b4a2ac172e990ef1975cd42975dad6 upstream.

De-referencing skb after call to gro_cells_receive() is not allowed.
We need to fetch skb->len earlier.

Fixes: 5491e7c6 ("macsec: enable GRO and RPS on macsec devices")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b6df5afc

drivers/net/macsec.c

+3 −1
Original line number Diff line number Diff line
@@ -1085,6 +1085,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) 
	struct macsec_rx_sa *rx_sa;

	struct macsec_rxh_data *rxd;

	struct macsec_dev *macsec;

	unsigned int len;

	sci_t sci;

	u32 pn;

	bool cbit;
@@ -1240,9 +1241,10 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) 
	macsec_rxsc_put(rx_sc);



	skb_orphan(skb);

	len = skb->len;

	ret = gro_cells_receive(&macsec->gro_cells, skb);

	if (ret == NET_RX_SUCCESS)

		count_rx(dev, skb->len);

		count_rx(dev, len);

	else

		macsec->secy.netdev->stats.rx_dropped++;