tipc: remove the unnecessary msg->req check from tipc_nl_compat_bearer_set
tipc_nl_compat_bearer_set() is only called by tipc_nl_compat_link_set() which already does the check for msg->req check, so remove it from tipc_nl_compat_bearer_set(), and do the same in tipc_nl_compat_media_set(). Signed-off-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
18f3896dfd
commit
8bc81c5708
@ -683,7 +683,6 @@ static int tipc_nl_compat_media_set(struct sk_buff *skb,
|
||||
struct nlattr *prop;
|
||||
struct nlattr *media;
|
||||
struct tipc_link_config *lc;
|
||||
int len;
|
||||
|
||||
lc = (struct tipc_link_config *)TLV_DATA(msg->req);
|
||||
|
||||
@ -691,10 +690,6 @@ static int tipc_nl_compat_media_set(struct sk_buff *skb,
|
||||
if (!media)
|
||||
return -EMSGSIZE;
|
||||
|
||||
len = min_t(int, TLV_GET_DATA_LEN(msg->req), TIPC_MAX_MEDIA_NAME);
|
||||
if (!string_is_valid(lc->name, len))
|
||||
return -EINVAL;
|
||||
|
||||
if (nla_put_string(skb, TIPC_NLA_MEDIA_NAME, lc->name))
|
||||
return -EMSGSIZE;
|
||||
|
||||
@ -715,7 +710,6 @@ static int tipc_nl_compat_bearer_set(struct sk_buff *skb,
|
||||
struct nlattr *prop;
|
||||
struct nlattr *bearer;
|
||||
struct tipc_link_config *lc;
|
||||
int len;
|
||||
|
||||
lc = (struct tipc_link_config *)TLV_DATA(msg->req);
|
||||
|
||||
@ -723,10 +717,6 @@ static int tipc_nl_compat_bearer_set(struct sk_buff *skb,
|
||||
if (!bearer)
|
||||
return -EMSGSIZE;
|
||||
|
||||
len = min_t(int, TLV_GET_DATA_LEN(msg->req), TIPC_MAX_MEDIA_NAME);
|
||||
if (!string_is_valid(lc->name, len))
|
||||
return -EINVAL;
|
||||
|
||||
if (nla_put_string(skb, TIPC_NLA_BEARER_NAME, lc->name))
|
||||
return -EMSGSIZE;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user