Commit da4063bd authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller

netlink: allow NLA_MSECS to have range validation

Since NLA_MSECS is really equivalent to NLA_U64, allow
it to have range validation as well.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d06a09b9
...@@ -371,7 +371,8 @@ struct nla_policy { ...@@ -371,7 +371,8 @@ struct nla_policy {
#define __NLA_ENSURE(condition) BUILD_BUG_ON_ZERO(!(condition)) #define __NLA_ENSURE(condition) BUILD_BUG_ON_ZERO(!(condition))
#define NLA_ENSURE_UINT_TYPE(tp) \ #define NLA_ENSURE_UINT_TYPE(tp) \
(__NLA_ENSURE(tp == NLA_U8 || tp == NLA_U16 || \ (__NLA_ENSURE(tp == NLA_U8 || tp == NLA_U16 || \
tp == NLA_U32 || tp == NLA_U64) + tp) tp == NLA_U32 || tp == NLA_U64 || \
tp == NLA_MSECS) + tp)
#define NLA_ENSURE_SINT_TYPE(tp) \ #define NLA_ENSURE_SINT_TYPE(tp) \
(__NLA_ENSURE(tp == NLA_S8 || tp == NLA_S16 || \ (__NLA_ENSURE(tp == NLA_S8 || tp == NLA_S16 || \
tp == NLA_S32 || tp == NLA_S64) + tp) tp == NLA_S32 || tp == NLA_S64) + tp)
...@@ -379,7 +380,8 @@ struct nla_policy { ...@@ -379,7 +380,8 @@ struct nla_policy {
(__NLA_ENSURE(tp == NLA_S8 || tp == NLA_U8 || \ (__NLA_ENSURE(tp == NLA_S8 || tp == NLA_U8 || \
tp == NLA_S16 || tp == NLA_U16 || \ tp == NLA_S16 || tp == NLA_U16 || \
tp == NLA_S32 || tp == NLA_U32 || \ tp == NLA_S32 || tp == NLA_U32 || \
tp == NLA_S64 || tp == NLA_U64) + tp) tp == NLA_S64 || tp == NLA_U64 || \
tp == NLA_MSECS) + tp)
#define NLA_ENSURE_NO_VALIDATION_PTR(tp) \ #define NLA_ENSURE_NO_VALIDATION_PTR(tp) \
(__NLA_ENSURE(tp != NLA_BITFIELD32 && \ (__NLA_ENSURE(tp != NLA_BITFIELD32 && \
tp != NLA_REJECT && \ tp != NLA_REJECT && \
......
...@@ -151,6 +151,7 @@ static int nla_validate_int_range_unsigned(const struct nla_policy *pt, ...@@ -151,6 +151,7 @@ static int nla_validate_int_range_unsigned(const struct nla_policy *pt,
value = nla_get_u32(nla); value = nla_get_u32(nla);
break; break;
case NLA_U64: case NLA_U64:
case NLA_MSECS:
value = nla_get_u64(nla); value = nla_get_u64(nla);
break; break;
default: default:
...@@ -227,6 +228,7 @@ static int nla_validate_int_range(const struct nla_policy *pt, ...@@ -227,6 +228,7 @@ static int nla_validate_int_range(const struct nla_policy *pt,
case NLA_U16: case NLA_U16:
case NLA_U32: case NLA_U32:
case NLA_U64: case NLA_U64:
case NLA_MSECS:
return nla_validate_int_range_unsigned(pt, nla, extack); return nla_validate_int_range_unsigned(pt, nla, extack);
case NLA_S8: case NLA_S8:
case NLA_S16: case NLA_S16:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment