diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-13 05:29:30 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-13 06:34:48 +0100 |
| commit | 1d343579312311aa9875b34d5a921f5e2ec69f0a (patch) | |
| tree | 64b636b5557d92f5266187f035dac34862db86d5 /net/netlink | |
| parent | inet: Use fallthrough; (diff) | |
| parent | Merge tag 'drm-fixes-2020-03-13' of git://anongit.freedesktop.org/drm/drm (diff) | |
| download | linux-1d343579312311aa9875b34d5a921f5e2ec69f0a.tar.xz linux-1d343579312311aa9875b34d5a921f5e2ec69f0a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes, nothing serious.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 19df49a6ad15..ed77c75bf63f 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -2434,7 +2434,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err, in_skb->len)) WARN_ON(nla_put_u32(skb, NLMSGERR_ATTR_OFFS, (u8 *)extack->bad_attr - - in_skb->data)); + (u8 *)nlh)); } else { if (extack->cookie_len) WARN_ON(nla_put(skb, NLMSGERR_ATTR_COOKIE, |