Revert "net: core: Support UID-based routing."

This reverts commit 99a6ea48b591877d1cd6a51732c40a1d5321d961.

diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index 4ac12e14c6d98b36c2ecdde79de1f0051ab2fe22..e361f4882426d26fa8e21dd20e9a6a285c578546 100644 (file)
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -23,8 +23,6 @@ struct fib_rule {
        struct fib_rule __rcu   *ctarget;
        char                    iifname[IFNAMSIZ];
        char                    oifname[IFNAMSIZ];
-       kuid_t                  uid_start;
-       kuid_t                  uid_end;
        struct rcu_head         rcu;
        struct net *            fr_net;
 };
@@ -82,9 +80,7 @@ struct fib_rules_ops {
        [FRA_FWMARK]    = { .type = NLA_U32 }, \
        [FRA_FWMASK]    = { .type = NLA_U32 }, \
        [FRA_TABLE]     = { .type = NLA_U32 }, \
-       [FRA_GOTO]      = { .type = NLA_U32 }, \
-       [FRA_UID_START] = { .type = NLA_U32 }, \
-       [FRA_UID_END]   = { .type = NLA_U32 }
+       [FRA_GOTO]      = { .type = NLA_U32 }
 
 static inline void fib_rule_get(struct fib_rule *rule)
 {

diff --git a/include/net/flow.h b/include/net/flow.h
index 1426681f7cf38691ff268ebdd92e4b226fc8cb44..0eb5516a4cae76e0cf52c5bd8a1cff2119d3a646 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -10,7 +10,6 @@
 #include <linux/socket.h>
 #include <linux/in6.h>
 #include <linux/atomic.h>
-#include <linux/uidgid.h>
 
 /*
  * ifindex generation is per-net namespace, and loopback is
@@ -32,7 +31,6 @@ struct flowi_common {
 #define FLOWI_FLAG_CAN_SLEEP           0x02
 #define FLOWI_FLAG_KNOWN_NH            0x04
        __u32   flowic_secid;
-       kuid_t  flowic_uid;
 };
 
 union flowi_uli {
@@ -69,7 +67,6 @@ struct flowi4 {
 #define flowi4_proto           __fl_common.flowic_proto
 #define flowi4_flags           __fl_common.flowic_flags
 #define flowi4_secid           __fl_common.flowic_secid
-#define flowi4_uid             __fl_common.flowic_uid
 
        /* (saddr,daddr) must be grouped, same order as in IP header */
        __be32                  saddr;
@@ -89,8 +86,7 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
                                      __u32 mark, __u8 tos, __u8 scope,
                                      __u8 proto, __u8 flags,
                                      __be32 daddr, __be32 saddr,
-                                     __be16 dport, __be16 sport,
-                                     kuid_t uid)
+                                     __be16 dport, __be16 sport)
 {
        fl4->flowi4_oif = oif;
        fl4->flowi4_iif = LOOPBACK_IFINDEX;
@@ -100,7 +96,6 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
        fl4->flowi4_proto = proto;
        fl4->flowi4_flags = flags;
        fl4->flowi4_secid = 0;
-       fl4->flowi4_uid = uid;
        fl4->daddr = daddr;
        fl4->saddr = saddr;
        fl4->fl4_dport = dport;
@@ -128,7 +123,6 @@ struct flowi6 {
 #define flowi6_proto           __fl_common.flowic_proto
 #define flowi6_flags           __fl_common.flowic_flags
 #define flowi6_secid           __fl_common.flowic_secid
-#define flowi6_uid             __fl_common.flowic_uid
        struct in6_addr         daddr;
        struct in6_addr         saddr;
        __be32                  flowlabel;
@@ -172,7 +166,6 @@ struct flowi {
 #define flowi_proto    u.__fl_common.flowic_proto
 #define flowi_flags    u.__fl_common.flowic_flags
 #define flowi_secid    u.__fl_common.flowic_secid
-#define flowi_uid      u.__fl_common.flowic_uid
 } __attribute__((__aligned__(BITS_PER_LONG/8)));
 
 static inline struct flowi *flowi4_to_flowi(struct flowi4 *fl4)

diff --git a/include/net/ip.h b/include/net/ip.h
index a04070b8249633826e81765e34f48819d8d46779..2e5194a230223e2bb04bb86e6a9573b74ce5fddf 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -155,7 +155,6 @@ struct ip_reply_arg {
                                /* -1 if not needed */ 
        int         bound_dev_if;
        u8          tos;
-       kuid_t      uid;
 }; 
 
 #define IP_REPLY_ARG_NOSRCCHECK 1

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 6be6debb5361bd8a8ca569973cb40a97f4b25ac7..8d977b3436474b057bd29d3898bfa771e14c23fb 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -136,7 +136,7 @@ extern int                  rt6_route_rcv(struct net_device *dev,
                                              const struct in6_addr *gwaddr);
 
 extern void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,
-                           int oif, u32 mark, kuid_t uid);
+                           int oif, u32 mark);
 extern void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk,
                               __be32 mtu);
 extern void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark);

diff --git a/include/net/route.h b/include/net/route.h
index b5b44875543e86768a7fe110520157077b0c9d22..2ea40c1b5e009746dacb8f146fdcc37309aa7ff3 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -142,7 +142,7 @@ static inline struct rtable *ip_route_output_ports(struct net *net, struct flowi
        flowi4_init_output(fl4, oif, sk ? sk->sk_mark : 0, tos,
                           RT_SCOPE_UNIVERSE, proto,
                           sk ? inet_sk_flowi_flags(sk) : 0,
-                          daddr, saddr, dport, sport, sock_i_uid(sk));
+                          daddr, saddr, dport, sport);
        if (sk)
                security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
        return ip_route_output_flow(net, fl4, sk);
@@ -253,8 +253,7 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32
                flow_flags |= FLOWI_FLAG_CAN_SLEEP;
 
        flowi4_init_output(fl4, oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE,
-                          protocol, flow_flags, dst, src, dport, sport,
-                          sock_i_uid(sk));
+                          protocol, flow_flags, dst, src, dport, sport);
 }
 
 static inline struct rtable *ip_route_connect(struct flowi4 *fl4,

diff --git a/include/uapi/linux/fib_rules.h b/include/uapi/linux/fib_rules.h
index 9dcdb6251cb877642229b577a2c16172ba43b123..51da65b68b8501cb2d25fe0064c2c6ff65e3d4e6 100644 (file)
--- a/include/uapi/linux/fib_rules.h
+++ b/include/uapi/linux/fib_rules.h
@@ -49,8 +49,6 @@ enum {
        FRA_TABLE,      /* Extended table id */
        FRA_FWMASK,     /* mask for netfilter mark */
        FRA_OIFNAME,
-       FRA_UID_START,  /* UID range */
-       FRA_UID_END,
        __FRA_MAX
 };
 

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 07c1146c1f51104bcc8912c1719e1297bcb57340..7a2144e1afae679a198449bad4e7b57a77a63fb0 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -297,7 +297,6 @@ enum rtattr_type_t {
        RTA_TABLE,
        RTA_MARK,
        RTA_MFC_STATS,
-       RTA_UID,
        __RTA_MAX
 };
 

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index ba1b50ef5700589988c16185f8f69e5abcf046fd..84340a2605edd7b4fbdec98d6db8ff8ee1c45cca 100644 (file)
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -31,8 +31,6 @@ int fib_default_rule_add(struct fib_rules_ops *ops,
        r->pref = pref;
        r->table = table;
        r->flags = flags;
-       r->uid_start = INVALID_UID;
-       r->uid_end = INVALID_UID;
        r->fr_net = hold_net(ops->fro_net);
 
        /* The lock is not required here, the list in unreacheable
@@ -181,23 +179,6 @@ void fib_rules_unregister(struct fib_rules_ops *ops)
 }
 EXPORT_SYMBOL_GPL(fib_rules_unregister);
 
-static inline kuid_t fib_nl_uid(struct nlattr *nla)
-{
-       return make_kuid(current_user_ns(), nla_get_u32(nla));
-}
-
-static int nla_put_uid(struct sk_buff *skb, int idx, kuid_t uid)
-{
-       return nla_put_u32(skb, idx, from_kuid_munged(current_user_ns(), uid));
-}
-
-static int fib_uid_range_match(struct flowi *fl, struct fib_rule *rule)
-{
-       return (!uid_valid(rule->uid_start) && !uid_valid(rule->uid_end)) ||
-              (uid_gte(fl->flowi_uid, rule->uid_start) &&
-               uid_lte(fl->flowi_uid, rule->uid_end));
-}
-
 static int fib_rule_match(struct fib_rule *rule, struct fib_rules_ops *ops,
                          struct flowi *fl, int flags)
 {
@@ -212,9 +193,6 @@ static int fib_rule_match(struct fib_rule *rule, struct fib_rules_ops *ops,
        if ((rule->mark ^ fl->flowi_mark) & rule->mark_mask)
                goto out;
 
-       if (!fib_uid_range_match(fl, rule))
-               goto out;
-
        ret = ops->match(rule, fl, flags);
 out:
        return (rule->flags & FIB_RULE_INVERT) ? !ret : ret;
@@ -385,19 +363,6 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh)
        } else if (rule->action == FR_ACT_GOTO)
                goto errout_free;
 
-       /* UID start and end must either both be valid or both unspecified. */
-       rule->uid_start = rule->uid_end = INVALID_UID;
-       if (tb[FRA_UID_START] || tb[FRA_UID_END]) {
-               if (tb[FRA_UID_START] && tb[FRA_UID_END]) {
-                       rule->uid_start = fib_nl_uid(tb[FRA_UID_START]);
-                       rule->uid_end = fib_nl_uid(tb[FRA_UID_END]);
-               }
-               if (!uid_valid(rule->uid_start) ||
-                   !uid_valid(rule->uid_end) ||
-                   !uid_lte(rule->uid_start, rule->uid_end))
-               goto errout_free;
-       }
-
        err = ops->configure(rule, skb, frh, tb);
        if (err < 0)
                goto errout_free;
@@ -504,14 +469,6 @@ static int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh)
                    (rule->mark_mask != nla_get_u32(tb[FRA_FWMASK])))
                        continue;
 
-               if (tb[FRA_UID_START] &&
-                   !uid_eq(rule->uid_start, fib_nl_uid(tb[FRA_UID_START])))
-                       continue;
-
-               if (tb[FRA_UID_END] &&
-                   !uid_eq(rule->uid_end, fib_nl_uid(tb[FRA_UID_END])))
-                       continue;
-
                if (!ops->compare(rule, frh, tb))
                        continue;
 
@@ -568,9 +525,7 @@ static inline size_t fib_rule_nlmsg_size(struct fib_rules_ops *ops,
                         + nla_total_size(4) /* FRA_PRIORITY */
                         + nla_total_size(4) /* FRA_TABLE */
                         + nla_total_size(4) /* FRA_FWMARK */
-                        + nla_total_size(4) /* FRA_FWMASK */
-                        + nla_total_size(4) /* FRA_UID_START */
-                        + nla_total_size(4); /* FRA_UID_END */
+                        + nla_total_size(4); /* FRA_FWMASK */
 
        if (ops->nlmsg_payload)
                payload += ops->nlmsg_payload(rule);
@@ -624,11 +579,7 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,
            ((rule->mark_mask || rule->mark) &&
             nla_put_u32(skb, FRA_FWMASK, rule->mark_mask)) ||
            (rule->target &&
-            nla_put_u32(skb, FRA_GOTO, rule->target)) ||
-           (uid_valid(rule->uid_start) &&
-            nla_put_uid(skb, FRA_UID_START, rule->uid_start)) ||
-           (uid_valid(rule->uid_end) &&
-            nla_put_uid(skb, FRA_UID_END, rule->uid_end)))
+            nla_put_u32(skb, FRA_GOTO, rule->target)))
                goto nla_put_failure;
        if (ops->fill(rule, skb, frh) < 0)
                goto nla_put_failure;

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 42da0b216bbf0a2d66d7914caaf268bfee575d5e..0f299ce1b4b2ea779c16fa2b49f02fc71095260e 100644 (file)
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -531,7 +531,6 @@ const struct nla_policy rtm_ipv4_policy[RTA_MAX + 1] = {
        [RTA_METRICS]           = { .type = NLA_NESTED },
        [RTA_MULTIPATH]         = { .len = sizeof(struct rtnexthop) },
        [RTA_FLOW]              = { .type = NLA_U32 },
-       [RTA_UID]               = { .type = NLA_U32 },
 };
 
 static int rtm_to_fib_config(struct net *net, struct sk_buff *skb,

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 4c3e36eb25c607df5ddc85849987b701bead96c6..d6ac8269407e80491ebcdb25e9a26e0c8e121526 100644 (file)
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -422,8 +422,7 @@ struct dst_entry *inet_csk_route_req(struct sock *sk,
                           sk->sk_protocol,
                           flags,
                           (opt && opt->opt.srr) ? opt->opt.faddr : ireq->rmt_addr,
-                          ireq->loc_addr, ireq->rmt_port, inet_sk(sk)->inet_sport,
-                          sock_i_uid(sk));
+                          ireq->loc_addr, ireq->rmt_port, inet_sk(sk)->inet_sport);
        security_req_classify_flow(req, flowi4_to_flowi(fl4));
        rt = ip_route_output_flow(net, fl4, sk);
        if (IS_ERR(rt))
@@ -459,8 +458,7 @@ struct dst_entry *inet_csk_route_child_sock(struct sock *sk,
                           RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
                           sk->sk_protocol, inet_sk_flowi_flags(sk),
                           (opt && opt->opt.srr) ? opt->opt.faddr : ireq->rmt_addr,
-                          ireq->loc_addr, ireq->rmt_port, inet_sk(sk)->inet_sport,
-                          sock_i_uid(sk));
+                          ireq->loc_addr, ireq->rmt_port, inet_sk(sk)->inet_sport);
        security_req_classify_flow(req, flowi4_to_flowi(fl4));
        rt = ip_route_output_flow(net, fl4, sk);
        if (IS_ERR(rt))

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 1204570dcced174a5b2707f1d11a9eaa7d417d89..a15b080130a3dff4e6a3363af56672bed144b9ef 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1494,8 +1494,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr,
                           RT_SCOPE_UNIVERSE, ip_hdr(skb)->protocol,
                           ip_reply_arg_flowi_flags(arg),
                           daddr, saddr,
-                          tcp_hdr(skb)->source, tcp_hdr(skb)->dest,
-                          arg->uid);
+                          tcp_hdr(skb)->source, tcp_hdr(skb)->dest);
        security_skb_classify_flow(skb, flowi4_to_flowi(&fl4));
        rt = ip_route_output_key(net, &fl4);
        if (IS_ERR(rt))

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index e0464231b8ad9fa6b2da24091168d01f1a4c31ba..eb9b1fa222135253fa4526da409d56c3e61db6c2 100644 (file)
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -782,8 +782,7 @@ int ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 
        flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
                           RT_SCOPE_UNIVERSE, sk->sk_protocol,
-                          inet_sk_flowi_flags(sk), faddr, saddr, 0, 0,
-                          sock_i_uid(sk));
+                          inet_sk_flowi_flags(sk), faddr, saddr, 0, 0);
 
        security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
        rt = ip_route_output_flow(net, &fl4, sk);

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index fc675315865d47e17bb02368239515a30ccf63bc..14aa2ceababcf1f783d51f3529ba6e4a3f920c14 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -575,8 +575,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                           RT_SCOPE_UNIVERSE,
                           inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol,
                           inet_sk_flowi_flags(sk) | FLOWI_FLAG_CAN_SLEEP,
-                          daddr, saddr, 0, 0,
-                          sock_i_uid(sk));
+                          daddr, saddr, 0, 0);
 
        if (!inet->hdrincl) {
                err = raw_probe_proto_opt(&fl4, msg);

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index dd1a3c567af670a577d9da5f2fe28706e3610598..fe162ac7ecc59ed554cc0749eb5ebec02c2bd3ae 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -515,7 +515,7 @@ void __ip_select_ident(struct iphdr *iph, int segs)
 }
 EXPORT_SYMBOL(__ip_select_ident);
 
-static void __build_flow_key(struct flowi4 *fl4, struct sock *sk,
+static void __build_flow_key(struct flowi4 *fl4, const struct sock *sk,
                             const struct iphdr *iph,
                             int oif, u8 tos,
                             u8 prot, u32 mark, int flow_flags)
@@ -531,12 +531,11 @@ static void __build_flow_key(struct flowi4 *fl4, struct sock *sk,
        flowi4_init_output(fl4, oif, mark, tos,
                           RT_SCOPE_UNIVERSE, prot,
                           flow_flags,
-                          iph->daddr, iph->saddr, 0, 0,
-                          sock_i_uid(sk));
+                          iph->daddr, iph->saddr, 0, 0);
 }
 
 static void build_skb_flow_key(struct flowi4 *fl4, const struct sk_buff *skb,
-                              struct sock *sk)
+                              const struct sock *sk)
 {
        const struct iphdr *iph = ip_hdr(skb);
        int oif = skb->dev->ifindex;
@@ -547,7 +546,7 @@ static void build_skb_flow_key(struct flowi4 *fl4, const struct sk_buff *skb,
        __build_flow_key(fl4, sk, iph, oif, tos, prot, mark, 0);
 }
 
-static void build_sk_flow_key(struct flowi4 *fl4, struct sock *sk)
+static void build_sk_flow_key(struct flowi4 *fl4, const struct sock *sk)
 {
        const struct inet_sock *inet = inet_sk(sk);
        const struct ip_options_rcu *inet_opt;
@@ -561,12 +560,11 @@ static void build_sk_flow_key(struct flowi4 *fl4, struct sock *sk)
                           RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
                           inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol,
                           inet_sk_flowi_flags(sk),
-                          daddr, inet->inet_saddr, 0, 0,
-                          sock_i_uid(sk));
+                          daddr, inet->inet_saddr, 0, 0);
        rcu_read_unlock();
 }
 
-static void ip_rt_build_flow_key(struct flowi4 *fl4, struct sock *sk,
+static void ip_rt_build_flow_key(struct flowi4 *fl4, const struct sock *sk,
                                 const struct sk_buff *skb)
 {
        if (skb)
@@ -2329,11 +2327,6 @@ static int rt_fill_info(struct net *net,  __be32 dst, __be32 src,
            nla_put_u32(skb, RTA_MARK, fl4->flowi4_mark))
                goto nla_put_failure;
 
-       if (!uid_eq(fl4->flowi4_uid, INVALID_UID) &&
-           nla_put_u32(skb, RTA_UID,
-                       from_kuid_munged(current_user_ns(), fl4->flowi4_uid)))
-               goto nla_put_failure;
-
        error = rt->dst.error;
 
        if (rt_is_input_route(rt)) {
@@ -2384,7 +2377,6 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh)
        int err;
        int mark;
        struct sk_buff *skb;
-       kuid_t uid;
 
        err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv4_policy);
        if (err < 0)
@@ -2412,10 +2404,6 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh)
        dst = tb[RTA_DST] ? nla_get_be32(tb[RTA_DST]) : 0;
        iif = tb[RTA_IIF] ? nla_get_u32(tb[RTA_IIF]) : 0;
        mark = tb[RTA_MARK] ? nla_get_u32(tb[RTA_MARK]) : 0;
-       if (tb[RTA_UID])
-               uid = make_kuid(current_user_ns(), nla_get_u32(tb[RTA_UID]));
-       else
-               uid = (iif ? INVALID_UID : current_uid());
 
        memset(&fl4, 0, sizeof(fl4));
        fl4.daddr = dst;
@@ -2423,7 +2411,6 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh)
        fl4.flowi4_tos = rtm->rtm_tos;
        fl4.flowi4_oif = tb[RTA_OIF] ? nla_get_u32(tb[RTA_OIF]) : 0;
        fl4.flowi4_mark = mark;
-       fl4.flowi4_uid = uid;
 
        if (iif) {
                struct net_device *dev;

diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index c94032b95c60142255c41cb911aca47aae9d5ec3..5abb45e281bea0ffdcfd14d9e017742d7b19c71a 100644 (file)
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -353,8 +353,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
                           RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE, IPPROTO_TCP,
                           inet_sk_flowi_flags(sk),
                           (opt && opt->srr) ? opt->faddr : ireq->rmt_addr,
-                          ireq->loc_addr, th->source, th->dest,
-                          sock_i_uid(sk));
+                          ireq->loc_addr, th->source, th->dest);
        security_req_classify_flow(req, flowi4_to_flowi(&fl4));
        rt = ip_route_output_key(sock_net(sk), &fl4);
        if (IS_ERR(rt)) {

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 6b94a468222f749315a3b4ea8289cb90aa1610a0..eca809f19bccc49de8f77105a3f80ef870ec1b5d 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -963,8 +963,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                flowi4_init_output(fl4, ipc.oif, sk->sk_mark, tos,
                                   RT_SCOPE_UNIVERSE, sk->sk_protocol,
                                   inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
-                                  faddr, saddr, dport, inet->inet_sport,
-                                  sock_i_uid(sk));
+                                  faddr, saddr, dport, inet->inet_sport);
 
                security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
                rt = ip_route_output_flow(net, fl4, sk);

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index dc96abd0dbb472662df1208aece3bb488285905c..112e14fa81bceb65a4de598c19ea5c6b69413907 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -702,7 +702,6 @@ int inet6_sk_rebuild_header(struct sock *sk)
                fl6.flowi6_mark = sk->sk_mark;
                fl6.fl6_dport = inet->inet_dport;
                fl6.fl6_sport = inet->inet_sport;
-               fl6.flowi6_uid = sock_i_uid(sk);
                security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
 
                rcu_read_lock();

diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index b903e19463c949b6e0dda0dfaae5fe44246b9d66..bb02e176cb70537ac7cdc01a03c0c641ab672741 100644 (file)
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -630,7 +630,7 @@ static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        if (type == NDISC_REDIRECT)
                ip6_redirect(skb, net, 0, 0);
        else
-               ip6_update_pmtu(skb, net, info, 0, 0, INVALID_UID);
+               ip6_update_pmtu(skb, net, info, 0, 0);
        xfrm_state_put(x);
 }
 

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 193274c912f34c036b0898e5dff73e0538dd1367..0deea6ef4cc1eda275346ca9252460246cd9f183 100644 (file)
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -162,7 +162,6 @@ ipv4_connected:
        fl6.flowi6_mark = sk->sk_mark;
        fl6.fl6_dport = inet->inet_dport;
        fl6.fl6_sport = inet->inet_sport;
-       fl6.flowi6_uid = sock_i_uid(sk);
 
        if (!fl6.flowi6_oif && (addr_type&IPV6_ADDR_MULTICAST))
                fl6.flowi6_oif = np->mcast_oif;

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index fdc81cb29e80c875154f48257ce45c5393b7f8de..40ffd72243a4f2d1ec9e5da494b3f2650dd027a6 100644 (file)
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -449,7 +449,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        if (type == NDISC_REDIRECT)
                ip6_redirect(skb, net, 0, 0);
        else
-               ip6_update_pmtu(skb, net, info, 0, 0, INVALID_UID);
+               ip6_update_pmtu(skb, net, info, 0, 0);
        xfrm_state_put(x);
 }
 

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index c1b611cc55ae8acde4196b3dca82d6006f61944a..84bdcd06dd34bcb89bc2d13a1750c7d0f19dec40 100644 (file)
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -90,7 +90,7 @@ static void icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        struct net *net = dev_net(skb->dev);
 
        if (type == ICMPV6_PKT_TOOBIG)
-               ip6_update_pmtu(skb, net, info, 0, 0, INVALID_UID);
+               ip6_update_pmtu(skb, net, info, 0, 0);
        else if (type == NDISC_REDIRECT)
                ip6_redirect(skb, net, 0, 0);
 

diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index 157f2b2bb3ee871bf9c7c2b1795a12ce4a50a173..9cdb8e434513a43de2854f35c234bbbf9374777e 100644 (file)
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -86,7 +86,6 @@ struct dst_entry *inet6_csk_route_req(struct sock *sk,
        fl6->flowi6_mark = inet_rsk(req)->ir_mark;
        fl6->fl6_dport = inet_rsk(req)->rmt_port;
        fl6->fl6_sport = inet_rsk(req)->loc_port;
-       fl6->flowi6_uid = sock_i_uid(sk);
        security_req_classify_flow(req, flowi6_to_flowi(fl6));
 
        dst = ip6_dst_lookup_flow(sk, fl6, final_p, false);
@@ -214,7 +213,6 @@ static struct dst_entry *inet6_csk_route_socket(struct sock *sk,
        fl6->flowi6_mark = sk->sk_mark;
        fl6->fl6_sport = inet->inet_sport;
        fl6->fl6_dport = inet->inet_dport;
-       fl6->flowi6_uid = sock_i_uid(sk);
        security_sk_classify_flow(sk, flowi6_to_flowi(fl6));
 
        rcu_read_lock();

diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index a1beb59a841eb1c03778df0cba1bf376c3bbd64c..7af5aee75d982327e7b258f72091780e83a01cc4 100644 (file)
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -78,7 +78,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        if (type == NDISC_REDIRECT)
                ip6_redirect(skb, net, 0, 0);
        else
-               ip6_update_pmtu(skb, net, info, 0, 0, INVALID_UID);
+               ip6_update_pmtu(skb, net, info, 0, 0);
        xfrm_state_put(x);
 }
 

diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
index 8b47c049fef6be971d2e47a8f11c265e7a858e39..1476e897a43d88f446c2691564b6370e5972e7bb 100644 (file)
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
@@ -159,7 +159,6 @@ int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
        fl6.saddr = np->saddr;
        fl6.daddr = *daddr;
        fl6.flowi6_mark = sk->sk_mark;
-       fl6.flowi6_uid = sock_i_uid(sk);
        fl6.fl6_icmp_type = user_icmph.icmp6_type;
        fl6.fl6_icmp_code = user_icmph.icmp6_code;
        security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index e212c85cc060ed86e1962199645546e52743a6c3..5fa9c06b43002b27bc9810e783390678608c241b 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -765,7 +765,6 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
        memset(&fl6, 0, sizeof(fl6));
 
        fl6.flowi6_mark = sk->sk_mark;
-       fl6.flowi6_uid = sock_i_uid(sk);
 
        if (sin6) {
                if (addr_len < SIN6_LEN_RFC2133)

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index eb9ba8fa0a83d8279dc18012df3b5df6d693fb22..7c46620fe71ed463b780b248684b1806990efe1f 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1143,7 +1143,7 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
 }
 
 void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,
-                    int oif, u32 mark, kuid_t uid)
+                    int oif, u32 mark)
 {
        const struct ipv6hdr *iph = (struct ipv6hdr *) skb->data;
        struct dst_entry *dst;
@@ -1156,7 +1156,6 @@ void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,
        fl6.daddr = iph->daddr;
        fl6.saddr = iph->saddr;
        fl6.flowlabel = ip6_flowinfo(iph);
-       fl6.flowi6_uid = uid;
 
        dst = ip6_route_output(net, NULL, &fl6);
        if (!dst->error)
@@ -1168,7 +1167,7 @@ EXPORT_SYMBOL_GPL(ip6_update_pmtu);
 void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, __be32 mtu)
 {
        ip6_update_pmtu(skb, sock_net(sk), mtu,
-                       sk->sk_bound_dev_if, sk->sk_mark, sock_i_uid(sk));
+                       sk->sk_bound_dev_if, sk->sk_mark);
 }
 EXPORT_SYMBOL_GPL(ip6_sk_update_pmtu);
 
@@ -2245,7 +2244,6 @@ static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = {
        [RTA_PRIORITY]          = { .type = NLA_U32 },
        [RTA_METRICS]           = { .type = NLA_NESTED },
        [RTA_MULTIPATH]         = { .len = sizeof(struct rtnexthop) },
-       [RTA_UID]               = { .type = NLA_U32 },
 };
 
 static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -2634,12 +2632,6 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh)
        if (tb[RTA_OIF])
                oif = nla_get_u32(tb[RTA_OIF]);
 
-       if (tb[RTA_UID])
-               fl6.flowi6_uid = make_kuid(current_user_ns(),
-                                          nla_get_u32(tb[RTA_UID]));
-       else
-               fl6.flowi6_uid = iif ? INVALID_UID : current_uid();
-
        if (iif) {
                struct net_device *dev;
                int flags = 0;

diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c
index 701d0656a402138e15522798dc6096fa6682be2c..a596f388339d0a227c874dfb61514b7d098d345d 100644 (file)
--- a/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
@@ -243,7 +243,6 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
                fl6.flowi6_mark = ireq->ir_mark;
                fl6.fl6_dport = inet_rsk(req)->rmt_port;
                fl6.fl6_sport = inet_sk(sk)->inet_sport;
-               fl6.flowi6_uid = sock_i_uid(sk);
                security_req_classify_flow(req, flowi6_to_flowi(&fl6));
 
                dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 184b67566cba4cc217ab4acb45def6ad6a720f39..285cd59939398f5f2e54b9ece6a831d2c351965a 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -253,7 +253,6 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
        fl6.flowi6_mark = sk->sk_mark;
        fl6.fl6_dport = usin->sin6_port;
        fl6.fl6_sport = inet->inet_sport;
-       fl6.flowi6_uid = sock_i_uid(sk);
 
        opt = rcu_dereference_protected(np->opt, sock_owned_by_user(sk));
        final_p = fl6_update_dst(&fl6, opt, &final);

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index f4989e72568e861ff7cfc9faaaf2c2a866c73ac2..79a44443777a075cf1e9d615e742546536e0a793 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1149,7 +1149,6 @@ do_udp_sendmsg:
                fl6.flowi6_oif = np->sticky_pktinfo.ipi6_ifindex;
 
        fl6.flowi6_mark = sk->sk_mark;
-       fl6.flowi6_uid = sock_i_uid(sk);
 
        if (msg->msg_controllen) {
                opt = &opt_space;