Commit 1b65bbcc authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: skip SKB copy if no netdev 



In ipa_endpoint_skb_copy(), a new socket buffer structure is
allocated so that some data can be copied into it.  However, after
doing this, if the endpoint has a null netdev pointer, we just drop
free the socket buffer.

Instead, check endpoint->netdev pointer first, and just return early
if it's null.  Also return early if the SKB allocation fails, to
avoid the deeper indentation in the normal path.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 01c36637

drivers/net/ipa/ipa_endpoint.c

+11 −10
Original line number Diff line number Diff line
@@ -1153,18 +1153,19 @@ static void ipa_endpoint_skb_copy(struct ipa_endpoint *endpoint, 
{

	struct sk_buff *skb;



	if (!endpoint->netdev)

		return;



	skb = __dev_alloc_skb(len, GFP_ATOMIC);

	if (skb) {

	if (!skb)

		return;



	/* Copy the data into the socket buffer and receive it */

	skb_put(skb, len);

	memcpy(skb->data, data, len);

	skb->truesize += extra;

	}



	/* Now receive it, or drop it if there's no netdev */

	if (endpoint->netdev)

	ipa_modem_skb_rx(endpoint->netdev, skb);

	else if (skb)

		dev_kfree_skb_any(skb);

}



static bool ipa_endpoint_skb_build(struct ipa_endpoint *endpoint,