From: Guillaume Nault <gnault@redhat.com>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, Nicolas Dichtel <nicolas.dichtel@6wind.com>
Subject: [PATCH net-next 1/2] netns: Parse NETNSA_FD and NETNSA_PID as signed integers
Date: Tue, 14 Jan 2020 23:25:22 +0100 [thread overview]
Message-ID: <0f37c946179b082bf1c5e34d2cfdd9223979ea83.1579040200.git.gnault@redhat.com> (raw)
In-Reply-To: <cover.1579040200.git.gnault@redhat.com>
These attributes represent signed values (file descriptors and PIDs).
Make that clear in nla_policy.
Signed-off-by: Guillaume Nault <gnault@redhat.com>
---
net/core/net_namespace.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 6412c1fbfcb5..85c565571c1c 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -706,8 +706,8 @@ static struct pernet_operations __net_initdata net_ns_ops = {
static const struct nla_policy rtnl_net_policy[NETNSA_MAX + 1] = {
[NETNSA_NONE] = { .type = NLA_UNSPEC },
[NETNSA_NSID] = { .type = NLA_S32 },
- [NETNSA_PID] = { .type = NLA_U32 },
- [NETNSA_FD] = { .type = NLA_U32 },
+ [NETNSA_PID] = { .type = NLA_S32 },
+ [NETNSA_FD] = { .type = NLA_S32 },
[NETNSA_TARGET_NSID] = { .type = NLA_S32 },
};
@@ -731,10 +731,10 @@ static int rtnl_net_newid(struct sk_buff *skb, struct nlmsghdr *nlh,
nsid = nla_get_s32(tb[NETNSA_NSID]);
if (tb[NETNSA_PID]) {
- peer = get_net_ns_by_pid(nla_get_u32(tb[NETNSA_PID]));
+ peer = get_net_ns_by_pid(nla_get_s32(tb[NETNSA_PID]));
nla = tb[NETNSA_PID];
} else if (tb[NETNSA_FD]) {
- peer = get_net_ns_by_fd(nla_get_u32(tb[NETNSA_FD]));
+ peer = get_net_ns_by_fd(nla_get_s32(tb[NETNSA_FD]));
nla = tb[NETNSA_FD];
} else {
NL_SET_ERR_MSG(extack, "Peer netns reference is missing");
@@ -874,10 +874,10 @@ static int rtnl_net_getid(struct sk_buff *skb, struct nlmsghdr *nlh,
if (err < 0)
return err;
if (tb[NETNSA_PID]) {
- peer = get_net_ns_by_pid(nla_get_u32(tb[NETNSA_PID]));
+ peer = get_net_ns_by_pid(nla_get_s32(tb[NETNSA_PID]));
nla = tb[NETNSA_PID];
} else if (tb[NETNSA_FD]) {
- peer = get_net_ns_by_fd(nla_get_u32(tb[NETNSA_FD]));
+ peer = get_net_ns_by_fd(nla_get_s32(tb[NETNSA_FD]));
nla = tb[NETNSA_FD];
} else if (tb[NETNSA_NSID]) {
peer = get_net_ns_by_id(net, nla_get_s32(tb[NETNSA_NSID]));
--
2.21.1
next prev parent reply other threads:[~2020-01-14 22:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 22:25 [PATCH net-next 0/2] netns: simple cleanups Guillaume Nault
2020-01-14 22:25 ` Guillaume Nault [this message]
2020-01-15 13:30 ` [PATCH net-next 1/2] netns: Parse NETNSA_FD and NETNSA_PID as signed integers Nicolas Dichtel
2020-01-15 14:55 ` Guillaume Nault
2020-01-14 22:25 ` [PATCH net-next 2/2] netns: constify exported functions Guillaume Nault
2020-01-15 13:43 ` Nicolas Dichtel
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=0f37c946179b082bf1c5e34d2cfdd9223979ea83.1579040200.git.gnault@redhat.com \
--to=gnault@redhat.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nicolas.dichtel@6wind.com \
/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).