diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-21 20:06:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-21 20:06:42 -0400 |
| commit | e2a7c34fb2856fd5306e307e170e3dde358d0dce (patch) | |
| tree | afeb300b04186b1a1f649b2cd8a401a75878297c /net/tipc | |
| parent | 7d3f0cd43feea1636dd7746f22fe8249b34d1b79 (diff) | |
| parent | 6470812e22261d2342ef1597be62e63a0423d691 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/netlink_compat.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c index 9bfe886ab330..750949dfc1d7 100644 --- a/net/tipc/netlink_compat.c +++ b/net/tipc/netlink_compat.c | |||
| @@ -258,13 +258,15 @@ static int tipc_nl_compat_dumpit(struct tipc_nl_compat_cmd_dump *cmd, | |||
| 258 | arg = nlmsg_new(0, GFP_KERNEL); | 258 | arg = nlmsg_new(0, GFP_KERNEL); |
| 259 | if (!arg) { | 259 | if (!arg) { |
| 260 | kfree_skb(msg->rep); | 260 | kfree_skb(msg->rep); |
| 261 | msg->rep = NULL; | ||
| 261 | return -ENOMEM; | 262 | return -ENOMEM; |
| 262 | } | 263 | } |
| 263 | 264 | ||
| 264 | err = __tipc_nl_compat_dumpit(cmd, msg, arg); | 265 | err = __tipc_nl_compat_dumpit(cmd, msg, arg); |
| 265 | if (err) | 266 | if (err) { |
| 266 | kfree_skb(msg->rep); | 267 | kfree_skb(msg->rep); |
| 267 | 268 | msg->rep = NULL; | |
| 269 | } | ||
| 268 | kfree_skb(arg); | 270 | kfree_skb(arg); |
| 269 | 271 | ||
| 270 | return err; | 272 | return err; |