diff mbox series

[net-next,v2,2/2] net: qualcomm: rmnet: Fix rx_handler for non-linear skbs

Message ID 1612282568-14094-2-git-send-email-loic.poulain@linaro.org
State Superseded
Headers show
Series [net-next,v2,1/2] net: mhi-net: Add de-aggeration support | expand

Commit Message

Loic Poulain Feb. 2, 2021, 4:16 p.m. UTC
There is no guarantee that rmnet rx_handler is only fed with linear
skbs, but current rmnet implementation does not check that, leading
to crash in case of non linear skbs processed as linear ones.

Fix that by ensuring skb linearization before processing.

Signed-off-by: Loic Poulain <loic.poulain@linaro.org>

---
 v2: Add this patch to the series to prevent crash

 drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.7.4

Comments

Willem de Bruijn Feb. 2, 2021, 10:46 p.m. UTC | #1
On Tue, Feb 2, 2021 at 11:08 AM Loic Poulain <loic.poulain@linaro.org> wrote:
>

> There is no guarantee that rmnet rx_handler is only fed with linear

> skbs, but current rmnet implementation does not check that, leading

> to crash in case of non linear skbs processed as linear ones.

>

> Fix that by ensuring skb linearization before processing.

>

> Signed-off-by: Loic Poulain <loic.poulain@linaro.org>


Acked-by: Willem de Bruijn <willemb@google.com>
Subash Abhinov Kasiviswanathan Feb. 3, 2021, 12:57 a.m. UTC | #2
On 2021-02-02 09:16, Loic Poulain wrote:
> There is no guarantee that rmnet rx_handler is only fed with linear

> skbs, but current rmnet implementation does not check that, leading

> to crash in case of non linear skbs processed as linear ones.

> 

> Fix that by ensuring skb linearization before processing.

> 

> Signed-off-by: Loic Poulain <loic.poulain@linaro.org>

> ---

>  v2: Add this patch to the series to prevent crash

> 

>  drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c

> b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c

> index 3d7d3ab..2776c32 100644

> --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c

> +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c

> @@ -180,7 +180,7 @@ rx_handler_result_t rmnet_rx_handler(struct sk_buff

> **pskb)

>  	struct rmnet_port *port;

>  	struct net_device *dev;

> 

> -	if (!skb)

> +	if (!skb || skb_linearize(skb))

>  		goto done;

> 

>  	if (skb->pkt_type == PACKET_LOOPBACK)


Reviewed-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
diff mbox series

Patch

diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
index 3d7d3ab..2776c32 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
@@ -180,7 +180,7 @@  rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb)
 	struct rmnet_port *port;
 	struct net_device *dev;
 
-	if (!skb)
+	if (!skb || skb_linearize(skb))
 		goto done;
 
 	if (skb->pkt_type == PACKET_LOOPBACK)