From patchwork Wed Dec 5 20:26:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Moore X-Patchwork-Id: 203936 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 0DC422C0123 for ; Thu, 6 Dec 2012 07:26:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932126Ab2LEU0L (ORCPT ); Wed, 5 Dec 2012 15:26:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6188 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932095Ab2LEU0H (ORCPT ); Wed, 5 Dec 2012 15:26:07 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qB5KQ6dn006783 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 5 Dec 2012 15:26:06 -0500 Received: from [127.0.0.1] (vpn-10-145.rdu.redhat.com [10.11.10.145]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qB5KQ4nj017072; Wed, 5 Dec 2012 15:26:05 -0500 Subject: [RFC PATCH v2 1/3] tun: correctly report an error in tun_flow_init() To: netdev@vger.kernel.org, linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov From: Paul Moore Cc: jasowang@redhat.com, mst@redhat.com Date: Wed, 05 Dec 2012 15:26:04 -0500 Message-ID: <20121205202604.18626.71229.stgit@localhost> In-Reply-To: <20121205202144.18626.61966.stgit@localhost> References: <20121205202144.18626.61966.stgit@localhost> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On error, the error code from tun_flow_init() is lost inside tun_set_iff(), this patch fixes this by assigning the tun_flow_init() error code to the "err" variable which is returned by the tun_flow_init() function on error. Signed-off-by: Paul Moore --- drivers/net/tun.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 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 a1b2389..14a0454 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1591,7 +1591,8 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) tun_net_init(dev); - if (tun_flow_init(tun)) + err = tun_flow_init(tun); + if (err < 0) goto err_free_dev; dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST |