From patchwork Sun Nov 30 10:03:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 416034 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CC36A140161 for ; Sun, 30 Nov 2014 21:03:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751200AbaK3KDg (ORCPT ); Sun, 30 Nov 2014 05:03:36 -0500 Received: from helcar.apana.org.au ([209.40.204.226]:50208 "EHLO helcar.apana.org.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751142AbaK3KDe (ORCPT ); Sun, 30 Nov 2014 05:03:34 -0500 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by fornost.hengli.com.au with esmtp (Exim 4.80 #3 (Debian)) id 1Xv1Lo-0008KA-CR; Sun, 30 Nov 2014 21:03:32 +1100 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.80) (envelope-from ) id 1Xv1Ln-0002cN-IE; Sun, 30 Nov 2014 18:03:31 +0800 Date: Sun, 30 Nov 2014 18:03:31 +0800 From: Herbert Xu To: Marcelo Ricardo Leitner Cc: netdev Subject: Re: tun issue after e0b46d0ee9c: tun: Use iovec iterators Message-ID: <20141130100331.GA10050@gondor.apana.org.au> References: <5478CC27.9040705@redhat.com> <20141128235935.GA2178@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20141128235935.GA2178@gondor.apana.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Sat, Nov 29, 2014 at 07:59:35AM +0800, Herbert Xu wrote: > On Fri, Nov 28, 2014 at 05:25:27PM -0200, Marcelo Ricardo Leitner wrote: > > > > I saw there are tun updates on Dave's queue but none seemed to handle this. > > > > I can't use current net-next > > (799d2fff1858004526ad75d66a5dd8a5cce6ad40) on a kvm hypervisor > > because tun got clogged somehow. Bisected down to: > > > > commit e0b46d0ee9c240c7430a47e9b0365674d4a04522 > > Author: Herbert Xu > > Date: Fri Nov 7 21:22:23 2014 +0800 > > Does this patch help? Oops, there was an embarrassing typo in the patch which causes it to not even build. Here is the corrected version. -- >8 -- Subject: tun: Fix GSO meta-data handling in tun_get_user When we write the GSO meta-data in tun_get_user we end up advancing the IO vector twice, thus exhausting the user buffer before we can finish writing the packet. Fixes: f5ff53b4d97c ("{macvtap,tun}_get_user(): switch to iov_iter") Reported-by: Marcelo Ricardo Leitner Signed-off-by: Herbert Xu Thanks, Acked-by: Jason Wang diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 4b743c6..6d44da1 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1052,7 +1052,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, if (gso.hdr_len > len) return -EINVAL; - iov_iter_advance(from, tun->vnet_hdr_sz); + iov_iter_advance(from, tun->vnet_hdr_sz - sizeof(gso)); } if ((tun->flags & TUN_TYPE_MASK) == TUN_TAP_DEV) {