lkml.org 
[lkml]   [2018]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next 1/5] rtnetlink: add rtnl_get_net_ns_capable()
    Date
    get_target_net() will be used in follow-up patches in ipv{4,6} codepaths to
    retrieve network namespaces based on network namespace identifiers. So
    remove the static declaration and export in the rtnetlink header. Also,
    rename it to rtnl_get_net_ns_capable() to make it obvious what this
    function is doing.

    Signed-off-by: Christian Brauner <christian@brauner.io>
    ---
    include/net/rtnetlink.h | 1 +
    net/core/rtnetlink.c | 13 +++++++++----
    2 files changed, 10 insertions(+), 4 deletions(-)

    diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
    index 0bbaa5488423..cf26e5aacac4 100644
    --- a/include/net/rtnetlink.h
    +++ b/include/net/rtnetlink.h
    @@ -165,6 +165,7 @@ int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm);

    int rtnl_nla_parse_ifla(struct nlattr **tb, const struct nlattr *head, int len,
    struct netlink_ext_ack *exterr);
    +struct net *rtnl_get_net_ns_capable(struct sock *sk, int netnsid);

    #define MODULE_ALIAS_RTNL_LINK(kind) MODULE_ALIAS("rtnl-link-" kind)

    diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
    index e3f743c141b3..c6c6f93cd195 100644
    --- a/net/core/rtnetlink.c
    +++ b/net/core/rtnetlink.c
    @@ -1795,7 +1795,12 @@ static bool link_dump_filtered(struct net_device *dev,
    return false;
    }

    -static struct net *get_target_net(struct sock *sk, int netnsid)
    +/**
    + * rtnl_get_net_ns_capable - Get a network namespace based on a netnsid.
    + *
    + * Returns the network namespace on success or a error pointer on failure.
    + */
    +struct net *rtnl_get_net_ns_capable(struct sock *sk, int netnsid)
    {
    struct net *net;

    @@ -1847,7 +1852,7 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
    ifla_policy, NULL) >= 0) {
    if (tb[IFLA_IF_NETNSID]) {
    netnsid = nla_get_s32(tb[IFLA_IF_NETNSID]);
    - tgt_net = get_target_net(skb->sk, netnsid);
    + tgt_net = rtnl_get_net_ns_capable(skb->sk, netnsid);
    if (IS_ERR(tgt_net)) {
    tgt_net = net;
    netnsid = -1;
    @@ -2715,7 +2720,7 @@ static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh,

    if (tb[IFLA_IF_NETNSID]) {
    netnsid = nla_get_s32(tb[IFLA_IF_NETNSID]);
    - tgt_net = get_target_net(NETLINK_CB(skb).sk, netnsid);
    + tgt_net = rtnl_get_net_ns_capable(NETLINK_CB(skb).sk, netnsid);
    if (IS_ERR(tgt_net))
    return PTR_ERR(tgt_net);
    }
    @@ -3125,7 +3130,7 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr *nlh,

    if (tb[IFLA_IF_NETNSID]) {
    netnsid = nla_get_s32(tb[IFLA_IF_NETNSID]);
    - tgt_net = get_target_net(NETLINK_CB(skb).sk, netnsid);
    + tgt_net = rtnl_get_net_ns_capable(NETLINK_CB(skb).sk, netnsid);
    if (IS_ERR(tgt_net))
    return PTR_ERR(tgt_net);
    }
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-08-29 01:21    [W:4.489 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site