Merge "msm: emac: Fix invalid pointer dereference" (992773f0) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/ethernet/qualcomm/emac/emac_main.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -796,6 +796,8 @@ static void emac_poll_hwtxtstamp(struct emac_adapter *adpt)
		*/
		while ((pskb = __skb_dequeue(pending_q))
		!= skb) {
		if (!pskb)
		break;
		EMAC_HWTXTSTAMP_CB(pskb)->sec = 0;
		EMAC_HWTXTSTAMP_CB(pskb)->ns = 0;
		__skb_queue_tail(q, pskb);
		@@ -1256,6 +1258,7 @@ static void emac_tx_map(struct emac_adapter *adpt,
		/* The last buffer info contain the skb address,
		* so it will be freed after unmap
		*/
		if (tpbuf)
		tpbuf->skb = skb;
		}