Message ID | 20240321000925.14941-1-pavan.kumar.linga@intel.com |
---|---|
State | Accepted |
Delegated to: | Anthony Nguyen |
Headers | show |
Series | [iwl-net] idpf: fix kernel panic on unknown packet types | expand |
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Pavan Kumar Linga > Sent: Wednesday, March 20, 2024 5:09 PM > To: intel-wired-lan@lists.osuosl.org > Cc: Tantilov, Emil S <emil.s.tantilov@intel.com>; Kitszel, Przemyslaw > <przemyslaw.kitszel@intel.com>; Hay, Joshua A <joshua.a.hay@intel.com>; > Daniele, Salvatore <sdaniele@redhat.com>; Nemeth, Balazs > <bnemeth@redhat.com>; Linga, Pavan Kumar > <pavan.kumar.linga@intel.com> > Subject: [Intel-wired-lan] [PATCH iwl-net] idpf: fix kernel panic on unknown > packet types > > From: Joshua Hay <joshua.a.hay@intel.com> > > In the very rare case where a packet type is unknown to the driver, > idpf_rx_process_skb_fields would return early without calling > eth_type_trans to set the skb protocol / the network layer handler. > This is especially problematic if tcpdump is running when such a > packet is received, i.e. it would cause a kernel panic. > > Instead, call eth_type_trans for every single packet, even when > the packet type is unknown. > > Fixes: 3a8845af66ed ("idpf: add RX splitq napi poll support") > Reported-by: Balazs Nemeth <bnemeth@redhat.com> > Signed-off-by: Joshua Hay <joshua.a.hay@intel.com> > Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com> > Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> > Tested-by: Salvatore Daniele <sdaniele@redhat.com> > Signed-off-by: Pavan Kumar Linga <pavan.kumar.linga@intel.com> > --- > drivers/net/ethernet/intel/idpf/idpf_txrx.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c > b/drivers/net/ethernet/intel/idpf/idpf_txrx.c > index 2f8ad79ae3f0..017a081d8580 100644 > --- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c > +++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c Tested-by: Krishneil Singh krishneil.k.singh@intel.com
diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c index 2f8ad79ae3f0..017a081d8580 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c +++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c @@ -2940,6 +2940,8 @@ static int idpf_rx_process_skb_fields(struct idpf_queue *rxq, rx_ptype = le16_get_bits(rx_desc->ptype_err_fflags0, VIRTCHNL2_RX_FLEX_DESC_ADV_PTYPE_M); + skb->protocol = eth_type_trans(skb, rxq->vport->netdev); + decoded = rxq->vport->rx_ptype_lkup[rx_ptype]; /* If we don't know the ptype we can't do anything else with it. Just * pass it up the stack as-is. @@ -2950,8 +2952,6 @@ static int idpf_rx_process_skb_fields(struct idpf_queue *rxq, /* process RSS/hash */ idpf_rx_hash(rxq, skb, rx_desc, &decoded); - skb->protocol = eth_type_trans(skb, rxq->vport->netdev); - if (le16_get_bits(rx_desc->hdrlen_flags, VIRTCHNL2_RX_FLEX_DESC_ADV_RSC_M)) return idpf_rx_rsc(rxq, skb, rx_desc, &decoded);