From patchwork Fri Jun 5 19:35:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sridhar Samudrala X-Patchwork-Id: 28164 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 6440BB70C2 for ; Sat, 6 Jun 2009 05:36:03 +1000 (EST) Received: by ozlabs.org (Postfix) id 5688ADDDA2; Sat, 6 Jun 2009 05:36:03 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id F20F3DDD0B for ; Sat, 6 Jun 2009 05:36:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752947AbZFETfr (ORCPT ); Fri, 5 Jun 2009 15:35:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752853AbZFETfr (ORCPT ); Fri, 5 Jun 2009 15:35:47 -0400 Received: from e1.ny.us.ibm.com ([32.97.182.141]:60279 "EHLO e1.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752016AbZFETfq (ORCPT ); Fri, 5 Jun 2009 15:35:46 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e1.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n55JVYI2029867 for ; Fri, 5 Jun 2009 15:31:34 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n55JZmul222724 for ; Fri, 5 Jun 2009 15:35:48 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n55JZmrb029223 for ; Fri, 5 Jun 2009 15:35:48 -0400 Received: from [9.47.18.19] (w-sridhar.beaverton.ibm.com [9.47.18.19]) by d01av04.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n55JZk7m029079; Fri, 5 Jun 2009 15:35:47 -0400 Subject: [PATCH net-next 3/3] tun: Fix copy/paste error in tun_get_user From: Sridhar Samudrala To: davem@davemloft.net, netdev@vger.kernel.org, mst@redhat.com Date: Fri, 05 Jun 2009 12:35:46 -0700 Message-Id: <1244230546.1526.78.camel@w-sridhar.beaverton.ibm.com> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 (2.24.5-1.fc10) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use the right structure while incrementing the offset in tun_get_user. Signed-off-by: Sridhar Samudrala if ((tun->flags & TUN_TYPE_MASK) == TUN_TAP_DEV) { Acked-by: Michael S. Tsirkin --- 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 diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 4cda69b..15cfcb2 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -567,7 +567,7 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun, if (gso.hdr_len > len) return -EINVAL; - offset += sizeof(pi); + offset += sizeof(gso); }