diff options
Diffstat (limited to 'backport/compat/backport-4.12.c')
| -rw-r--r-- | backport/compat/backport-4.12.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/backport/compat/backport-4.12.c b/backport/compat/backport-4.12.c index 767ecb98..f997b6c5 100644 --- a/backport/compat/backport-4.12.c +++ b/backport/compat/backport-4.12.c @@ -87,17 +87,16 @@ static void extack_netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, * requested. * (ignored in backports) */ + if (nlk_has_extack && extack && extack->_msg) + tlvlen += nla_total_size(strlen(extack->_msg) + 1); + if (err) { if (1) payload += nlmsg_len(nlh); else flags |= NLM_F_CAPPED; - if (nlk_has_extack && extack) { - if (extack->_msg) - tlvlen += nla_total_size(strlen(extack->_msg) + 1); - if (extack->bad_attr) - tlvlen += nla_total_size(sizeof(u32)); - } + if (nlk_has_extack && extack && extack->bad_attr) + tlvlen += nla_total_size(sizeof(u32)); } else { flags |= NLM_F_CAPPED; @@ -122,10 +121,11 @@ static void extack_netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, memcpy(&errmsg->msg, nlh, payload > sizeof(*errmsg) ? nlh->nlmsg_len : sizeof(*nlh)); if (nlk_has_extack && extack) { + if (extack->_msg) { + WARN_ON(nla_put_string(skb, NLMSGERR_ATTR_MSG, + extack->_msg)); + } if (err) { - if (extack->_msg) - WARN_ON(nla_put_string(skb, NLMSGERR_ATTR_MSG, - extack->_msg)); if (extack->bad_attr && !WARN_ON((u8 *)extack->bad_attr < in_skb->data || (u8 *)extack->bad_attr >= in_skb->data + |