Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-microblaze.git] / net / mpls / af_mpls.c

diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index 7d55d4c..f7c5445 100644 (file)
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -1209,21 +1209,57 @@ static const struct nla_policy devconf_mpls_policy[NETCONFA_MAX + 1] = {
        [NETCONFA_IFINDEX]      = { .len = sizeof(int) },
 };
 
+static int mpls_netconf_valid_get_req(struct sk_buff *skb,
+                                     const struct nlmsghdr *nlh,
+                                     struct nlattr **tb,
+                                     struct netlink_ext_ack *extack)
+{
+       int i, err;
+
+       if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(struct netconfmsg))) {
+               NL_SET_ERR_MSG_MOD(extack,
+                                  "Invalid header for netconf get request");
+               return -EINVAL;
+       }
+
+       if (!netlink_strict_get_check(skb))
+               return nlmsg_parse(nlh, sizeof(struct netconfmsg), tb,
+                                  NETCONFA_MAX, devconf_mpls_policy, extack);
+
+       err = nlmsg_parse_strict(nlh, sizeof(struct netconfmsg), tb,
+                                NETCONFA_MAX, devconf_mpls_policy, extack);
+       if (err)
+               return err;
+
+       for (i = 0; i <= NETCONFA_MAX; i++) {
+               if (!tb[i])
+                       continue;
+
+               switch (i) {
+               case NETCONFA_IFINDEX:
+                       break;
+               default:
+                       NL_SET_ERR_MSG_MOD(extack, "Unsupported attribute in netconf get request");
+                       return -EINVAL;
+               }
+       }
+
+       return 0;
+}
+
 static int mpls_netconf_get_devconf(struct sk_buff *in_skb,
                                    struct nlmsghdr *nlh,
                                    struct netlink_ext_ack *extack)
 {
        struct net *net = sock_net(in_skb->sk);
        struct nlattr *tb[NETCONFA_MAX + 1];
-       struct netconfmsg *ncm;
        struct net_device *dev;
        struct mpls_dev *mdev;
        struct sk_buff *skb;
        int ifindex;
        int err;
 
-       err = nlmsg_parse(nlh, sizeof(*ncm), tb, NETCONFA_MAX,
-                         devconf_mpls_policy, extack);
+       err = mpls_netconf_valid_get_req(in_skb, nlh, tb, extack);
        if (err < 0)
                goto errout;
 
@@ -1838,6 +1874,9 @@ static int rtm_to_route_config(struct sk_buff *skb,
                                goto errout;
                        break;
                }
+               case RTA_GATEWAY:
+                       NL_SET_ERR_MSG(extack, "MPLS does not support RTA_GATEWAY attribute");
+                       goto errout;
                case RTA_VIA:
                {
                        if (nla_get_via(nla, &cfg->rc_via_alen,
@@ -2236,6 +2275,64 @@ errout:
                rtnl_set_sk_err(net, RTNLGRP_MPLS_ROUTE, err);
 }
 
+static int mpls_valid_getroute_req(struct sk_buff *skb,
+                                  const struct nlmsghdr *nlh,
+                                  struct nlattr **tb,
+                                  struct netlink_ext_ack *extack)
+{
+       struct rtmsg *rtm;
+       int i, err;
+
+       if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*rtm))) {
+               NL_SET_ERR_MSG_MOD(extack,
+                                  "Invalid header for get route request");
+               return -EINVAL;
+       }
+
+       if (!netlink_strict_get_check(skb))
+               return nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX,
+                                  rtm_mpls_policy, extack);
+
+       rtm = nlmsg_data(nlh);
+       if ((rtm->rtm_dst_len && rtm->rtm_dst_len != 20) ||
+           rtm->rtm_src_len || rtm->rtm_tos || rtm->rtm_table ||
+           rtm->rtm_protocol || rtm->rtm_scope || rtm->rtm_type) {
+               NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for get route request");
+               return -EINVAL;
+       }
+       if (rtm->rtm_flags & ~RTM_F_FIB_MATCH) {
+               NL_SET_ERR_MSG_MOD(extack,
+                                  "Invalid flags for get route request");
+               return -EINVAL;
+       }
+
+       err = nlmsg_parse_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
+                                rtm_mpls_policy, extack);
+       if (err)
+               return err;
+
+       if ((tb[RTA_DST] || tb[RTA_NEWDST]) && !rtm->rtm_dst_len) {
+               NL_SET_ERR_MSG_MOD(extack, "rtm_dst_len must be 20 for MPLS");
+               return -EINVAL;
+       }
+
+       for (i = 0; i <= RTA_MAX; i++) {
+               if (!tb[i])
+                       continue;
+
+               switch (i) {
+               case RTA_DST:
+               case RTA_NEWDST:
+                       break;
+               default:
+                       NL_SET_ERR_MSG_MOD(extack, "Unsupported attribute in get route request");
+                       return -EINVAL;
+               }
+       }
+
+       return 0;
+}
+
 static int mpls_getroute(struct sk_buff *in_skb, struct nlmsghdr *in_nlh,
                         struct netlink_ext_ack *extack)
 {
@@ -2255,8 +2352,7 @@ static int mpls_getroute(struct sk_buff *in_skb, struct nlmsghdr *in_nlh,
        u8 n_labels;
        int err;
 
-       err = nlmsg_parse(in_nlh, sizeof(*rtm), tb, RTA_MAX,
-                         rtm_mpls_policy, extack);
+       err = mpls_valid_getroute_req(in_skb, in_nlh, tb, extack);
        if (err < 0)
                goto errout;