| Submitter | Sjur Brændeland |
|---|---|
| Date | Jan. 7, 2011, 11:57 a.m. |
| Message ID | <1294401428-2085-1-git-send-email-sjurbren@stericsson.com> |
| Download | mbox | patch |
| Permalink | /patch/77872/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
From: Sjur Brændeland <sjurbren@stericsson.com> Date: Fri, 07 Jan 2011 12:57:08 +0100 > From: Kumar Sanghvi <kumar.sanghvi@stericsson.com> > > Checks version field of IP in the receive path for GPRS/3G data > and appropriately sets the value of skb->protocol. > > Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index 84a422c..fa9dab3 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c @@ -76,6 +76,8 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt) struct chnl_net *priv = container_of(layr, struct chnl_net, chnl); int pktlen; int err = 0; + const u8 *ip_version; + u8 buf; priv = container_of(layr, struct chnl_net, chnl); @@ -90,7 +92,21 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt) * send the packet to the net stack. */ skb->dev = priv->netdev; - skb->protocol = htons(ETH_P_IP); + + /* check the version of IP */ + ip_version = skb_header_pointer(skb, 0, 1, &buf); + if (!ip_version) + return -EINVAL; + switch (*ip_version >> 4) { + case 4: + skb->protocol = htons(ETH_P_IP); + break; + case 6: + skb->protocol = htons(ETH_P_IPV6); + break; + default: + return -EINVAL; + } /* If we change the header in loop mode, the checksum is corrupted. */ if (priv->conn_req.protocol == CAIFPROTO_DATAGRAM_LOOP)