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

Commit f5a45325 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by David S. Miller
Browse files

f_phonet: avoid pskb_pull(), fix OOPS with CONFIG_HIGHMEM 



This is similar to what we already do in cdc-phonet.c in the same
situation. pskb_pull() refuses to work with HIGHMEM, even if it is
known that the socket buffer is entirely in "low" memory.

Signed-off-by: default avatarRémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9eb0e6f2

drivers/usb/gadget/f_phonet.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -346,14 +346,19 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req) 




		if (unlikely(!skb))

		if (unlikely(!skb))

			break;

			break;

		skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page, 0,

				req->actual);

		page = NULL;





		if (req->actual < req->length) { /* Last fragment */

		if (skb->len == 0) { /* First fragment */

			skb->protocol = htons(ETH_P_PHONET);

			skb->protocol = htons(ETH_P_PHONET);

			skb_reset_mac_header(skb);

			skb_reset_mac_header(skb);

			pskb_pull(skb, 1);

			/* Can't use pskb_pull() on page in IRQ */

			memcpy(skb_put(skb, 1), page_address(page), 1);

		}



		skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page,

				skb->len == 0, req->actual);

		page = NULL;



		if (req->actual < req->length) { /* Last fragment */

			skb->dev = dev;

			skb->dev = dev;

			dev->stats.rx_packets++;

			dev->stats.rx_packets++;

			dev->stats.rx_bytes += skb->len;

			dev->stats.rx_bytes += skb->len;