Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

[linux-2.6-microblaze.git] / lib / nlattr.c

diff --git a/lib/nlattr.c b/lib/nlattr.c
index a8beb17..bc5b5cf 100644 (file)
--- a/lib/nlattr.c
+++ b/lib/nlattr.c
@@ -111,26 +111,40 @@ static int nla_validate_array(const struct nlattr *head, int len, int maxtype,
        return 0;
 }
 
-static int nla_validate_int_range_unsigned(const struct nla_policy *pt,
-                                          const struct nlattr *nla,
-                                          struct netlink_ext_ack *extack)
+void nla_get_range_unsigned(const struct nla_policy *pt,
+                           struct netlink_range_validation *range)
 {
-       struct netlink_range_validation _range = {
-               .min = 0,
-               .max = U64_MAX,
-       }, *range = &_range;
-       u64 value;
-
        WARN_ON_ONCE(pt->validation_type != NLA_VALIDATE_RANGE_PTR &&
                     (pt->min < 0 || pt->max < 0));
 
+       range->min = 0;
+
+       switch (pt->type) {
+       case NLA_U8:
+               range->max = U8_MAX;
+               break;
+       case NLA_U16:
+               range->max = U16_MAX;
+               break;
+       case NLA_U32:
+               range->max = U32_MAX;
+               break;
+       case NLA_U64:
+       case NLA_MSECS:
+               range->max = U64_MAX;
+               break;
+       default:
+               WARN_ON_ONCE(1);
+               return;
+       }
+
        switch (pt->validation_type) {
        case NLA_VALIDATE_RANGE:
                range->min = pt->min;
                range->max = pt->max;
                break;
        case NLA_VALIDATE_RANGE_PTR:
-               range = pt->range;
+               *range = *pt->range;
                break;
        case NLA_VALIDATE_MIN:
                range->min = pt->min;
@@ -138,7 +152,17 @@ static int nla_validate_int_range_unsigned(const struct nla_policy *pt,
        case NLA_VALIDATE_MAX:
                range->max = pt->max;
                break;
+       default:
+               break;
        }
+}
+
+static int nla_validate_int_range_unsigned(const struct nla_policy *pt,
+                                          const struct nlattr *nla,
+                                          struct netlink_ext_ack *extack)
+{
+       struct netlink_range_validation range;
+       u64 value;
 
        switch (pt->type) {
        case NLA_U8:
@@ -151,13 +175,16 @@ static int nla_validate_int_range_unsigned(const struct nla_policy *pt,
                value = nla_get_u32(nla);
                break;
        case NLA_U64:
+       case NLA_MSECS:
                value = nla_get_u64(nla);
                break;
        default:
                return -EINVAL;
        }
 
-       if (value < range->min || value > range->max) {
+       nla_get_range_unsigned(pt, &range);
+
+       if (value < range.min || value > range.max) {
                NL_SET_ERR_MSG_ATTR(extack, nla,
                                    "integer out of range");
                return -ERANGE;
@@ -166,15 +193,30 @@ static int nla_validate_int_range_unsigned(const struct nla_policy *pt,
        return 0;
 }
 
-static int nla_validate_int_range_signed(const struct nla_policy *pt,
-                                        const struct nlattr *nla,
-                                        struct netlink_ext_ack *extack)
+void nla_get_range_signed(const struct nla_policy *pt,
+                         struct netlink_range_validation_signed *range)
 {
-       struct netlink_range_validation_signed _range = {
-               .min = S64_MIN,
-               .max = S64_MAX,
-       }, *range = &_range;
-       s64 value;
+       switch (pt->type) {
+       case NLA_S8:
+               range->min = S8_MIN;
+               range->max = S8_MAX;
+               break;
+       case NLA_S16:
+               range->min = S16_MIN;
+               range->max = S16_MAX;
+               break;
+       case NLA_S32:
+               range->min = S32_MIN;
+               range->max = S32_MAX;
+               break;
+       case NLA_S64:
+               range->min = S64_MIN;
+               range->max = S64_MAX;
+               break;
+       default:
+               WARN_ON_ONCE(1);
+               return;
+       }
 
        switch (pt->validation_type) {
        case NLA_VALIDATE_RANGE:
@@ -182,7 +224,7 @@ static int nla_validate_int_range_signed(const struct nla_policy *pt,
                range->max = pt->max;
                break;
        case NLA_VALIDATE_RANGE_PTR:
-               range = pt->range_signed;
+               *range = *pt->range_signed;
                break;
        case NLA_VALIDATE_MIN:
                range->min = pt->min;
@@ -190,7 +232,17 @@ static int nla_validate_int_range_signed(const struct nla_policy *pt,
        case NLA_VALIDATE_MAX:
                range->max = pt->max;
                break;
+       default:
+               break;
        }
+}
+
+static int nla_validate_int_range_signed(const struct nla_policy *pt,
+                                        const struct nlattr *nla,
+                                        struct netlink_ext_ack *extack)
+{
+       struct netlink_range_validation_signed range;
+       s64 value;
 
        switch (pt->type) {
        case NLA_S8:
@@ -209,7 +261,9 @@ static int nla_validate_int_range_signed(const struct nla_policy *pt,
                return -EINVAL;
        }
 
-       if (value < range->min || value > range->max) {
+       nla_get_range_signed(pt, &range);
+
+       if (value < range.min || value > range.max) {
                NL_SET_ERR_MSG_ATTR(extack, nla,
                                    "integer out of range");
                return -ERANGE;
@@ -227,6 +281,7 @@ static int nla_validate_int_range(const struct nla_policy *pt,
        case NLA_U16:
        case NLA_U32:
        case NLA_U64:
+       case NLA_MSECS:
                return nla_validate_int_range_unsigned(pt, nla, extack);
        case NLA_S8:
        case NLA_S16:
@@ -259,7 +314,9 @@ static int validate_nla(const struct nlattr *nla, int maxtype,
        BUG_ON(pt->type > NLA_TYPE_MAX);
 
        if ((nla_attr_len[pt->type] && attrlen != nla_attr_len[pt->type]) ||
-           (pt->type == NLA_EXACT_LEN_WARN && attrlen != pt->len)) {
+           (pt->type == NLA_EXACT_LEN &&
+            pt->validation_type == NLA_VALIDATE_WARN_TOO_LONG &&
+            attrlen != pt->len)) {
                pr_warn_ratelimited("netlink: '%s': attribute type %d has an invalid length.\n",
                                    current->comm, type);
                if (validate & NL_VALIDATE_STRICT_ATTRS) {
@@ -285,11 +342,6 @@ static int validate_nla(const struct nlattr *nla, int maxtype,
        }
 
        switch (pt->type) {
-       case NLA_EXACT_LEN:
-               if (attrlen != pt->len)
-                       goto out_err;
-               break;
-
        case NLA_REJECT:
                if (extack && pt->reject_message) {
                        NL_SET_BAD_ATTR(extack, nla);
@@ -403,6 +455,13 @@ static int validate_nla(const struct nlattr *nla, int maxtype,
                        goto out_err;
                break;
 
+       case NLA_EXACT_LEN:
+               if (pt->validation_type != NLA_VALIDATE_WARN_TOO_LONG) {
+                       if (attrlen != pt->len)
+                               goto out_err;
+                       break;
+               }
+               /* fall through */
        default:
                if (pt->len)
                        minlen = pt->len;