From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932367AbYFFUVU (ORCPT ); Fri, 6 Jun 2008 16:21:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759405AbYFFUVL (ORCPT ); Fri, 6 Jun 2008 16:21:11 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:37284 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759321AbYFFUVJ (ORCPT ); Fri, 6 Jun 2008 16:21:09 -0400 X-IronPort-AV: E=McAfee;i="5200,2160,5312"; a="3745408" Message-ID: <48499C32.6070703@qualcomm.com> Date: Fri, 06 Jun 2008 13:21:06 -0700 From: Max Krasnyanskiy User-Agent: Thunderbird 2.0.0.14 (X11/20080501) MIME-Version: 1.0 To: Ang Way Chuang , David Miller , "Zabele, Stephen (US SSA)" CC: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] NET: Proper handling of IPv6 header in tun driver when TUN_NO_PI is set References: <4849162D.7000401@nav6.org> In-Reply-To: <4849162D.7000401@nav6.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Acked-by: Max Krasnyansky Dave, can you please add this patch to your tree. -- Steve, this is what I meant by "we do not need extra copy_from_user". We already do copy into the SKB and can parse the header right there. Max Ang Way Chuang wrote: > By default, tun.c running in TUN_TUN_DEV mode will set the protocol of > packet to IPv4 if TUN_NO_PI is set. My program failed to work when I > assumed that the driver will check the first nibble of packet, determine > IP version and set the appropriate protocol. > > The test for this change was conducted on 2.6.24.7 kernel. But the diff > is produced using git commit > c3b25b32e8bef526cca748e1ba023c6bdd705a99. I couldn't test it on kernel > version greater than 2.6.25 due to out of tree driver failing to > compile. But tun_get_user doesn't change that much between 2.6.24 and > 2.6.26, so it should work, I hope :-D. This patch is trivial because > this problem can also be fixed by not using TUN_NO_PI. > > Signed-off-by: Ang Way Chuang > --- > > diff --git a/drivers/net/tun.c b/drivers/net/tun.c > index 0ce07a3..77964bc 100644 > --- a/drivers/net/tun.c > +++ b/drivers/net/tun.c > @@ -313,6 +313,21 @@ static __inline__ ssize_t tun_get_user(struct > tun_struct *tun, struct iovec *iv, > > switch (tun->flags & TUN_TYPE_MASK) { > case TUN_TUN_DEV: > + if (tun->flags & TUN_NO_PI) { > + switch (skb->data[0] & 0xf0) { > + case 0x40: > + pi.proto = __constant_htons(ETH_P_IP); > + break; > + case 0x60: > + pi.proto = __constant_htons(ETH_P_IPV6); > + break; > + default: > + tun->dev->stats.rx_dropped++; > + kfree_skb(skb); > + return -EINVAL; > + } > + } > + > skb_reset_mac_header(skb); > skb->protocol = pi.proto; > skb->dev = tun->dev; > > -- >