From: Paul Moore <pmoore@redhat.com>
To: netdev@vger.kernel.org, linux-security-module@vger.kernel.org,
selinux@tycho.nsa.gov
Cc: jasowang@redhat.com, mst@redhat.com
Subject: [RFC PATCH v2 1/3] tun: correctly report an error in tun_flow_init()
Date: Wed, 05 Dec 2012 15:26:04 -0500 [thread overview]
Message-ID: <20121205202604.18626.71229.stgit@localhost> (raw)
In-Reply-To: <20121205202144.18626.61966.stgit@localhost>
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 <pmoore@redhat.com>
---
drivers/net/tun.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 |
next prev parent reply other threads:[~2012-12-05 20:26 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-05 20:25 [RFC PATCH v2 0/3] Fix some multiqueue TUN problems Paul Moore
2012-12-05 20:26 ` Paul Moore [this message]
2012-12-06 10:31 ` [RFC PATCH v2 1/3] tun: correctly report an error in tun_flow_init() Jason Wang
2012-12-06 15:46 ` Paul Moore
2012-12-05 20:26 ` [RFC PATCH v2 2/3] selinux: add the "create_queue" permission to the "tun_socket" class Paul Moore
2012-12-05 20:26 ` [RFC PATCH v2 3/3] tun: fix LSM/SELinux labeling of tun/tap devices Paul Moore
2012-12-06 10:29 ` Jason Wang
2012-12-06 15:36 ` Paul Moore
2012-12-07 5:29 ` Jason Wang
2012-12-06 10:33 ` Michael S. Tsirkin
2012-12-06 13:51 ` Jason Wang
2012-12-06 14:12 ` Michael S. Tsirkin
2012-12-06 15:46 ` Paul Moore
2012-12-06 16:12 ` Michael S. Tsirkin
2012-12-06 16:56 ` Paul Moore
2012-12-06 20:57 ` Michael S. Tsirkin
2012-12-06 21:09 ` Paul Moore
2012-12-07 12:25 ` Michael S. Tsirkin
2012-12-10 17:04 ` Paul Moore
2012-12-10 17:26 ` Michael S. Tsirkin
2012-12-10 17:33 ` Paul Moore
2012-12-10 17:50 ` Michael S. Tsirkin
2012-12-10 18:42 ` Eric Paris
2012-12-10 22:21 ` Paul Moore
2012-12-10 22:43 ` Paul Moore
2012-12-11 6:41 ` Jason Wang
2012-12-12 9:10 ` Michael S. Tsirkin
2012-12-07 5:41 ` Jason Wang
2012-12-12 9:22 ` Michael S. Tsirkin
2012-12-12 18:49 ` Paul Moore
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121205202604.18626.71229.stgit@localhost \
--to=pmoore@redhat.com \
--cc=jasowang@redhat.com \
--cc=linux-security-module@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=selinux@tycho.nsa.gov \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).