diff options
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
-rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index c6439c77953..f13fc57e1ec 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
@@ -512,7 +512,7 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, | |||
512 | 512 | ||
513 | skb = ctnetlink_alloc_skb(tuple(ct, IP_CT_DIR_ORIGINAL), GFP_ATOMIC); | 513 | skb = ctnetlink_alloc_skb(tuple(ct, IP_CT_DIR_ORIGINAL), GFP_ATOMIC); |
514 | if (!skb) | 514 | if (!skb) |
515 | return NOTIFY_DONE; | 515 | goto errout; |
516 | 516 | ||
517 | b = skb->tail; | 517 | b = skb->tail; |
518 | 518 | ||
@@ -591,8 +591,9 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, | |||
591 | nla_put_failure: | 591 | nla_put_failure: |
592 | rcu_read_unlock(); | 592 | rcu_read_unlock(); |
593 | nlmsg_failure: | 593 | nlmsg_failure: |
594 | nfnetlink_set_err(0, group, -ENOBUFS); | ||
595 | kfree_skb(skb); | 594 | kfree_skb(skb); |
595 | errout: | ||
596 | nfnetlink_set_err(0, group, -ENOBUFS); | ||
596 | return NOTIFY_DONE; | 597 | return NOTIFY_DONE; |
597 | } | 598 | } |
598 | #endif /* CONFIG_NF_CONNTRACK_EVENTS */ | 599 | #endif /* CONFIG_NF_CONNTRACK_EVENTS */ |
@@ -987,7 +988,7 @@ ctnetlink_change_helper(struct nf_conn *ct, struct nlattr *cda[]) | |||
987 | { | 988 | { |
988 | struct nf_conntrack_helper *helper; | 989 | struct nf_conntrack_helper *helper; |
989 | struct nf_conn_help *help = nfct_help(ct); | 990 | struct nf_conn_help *help = nfct_help(ct); |
990 | char *helpname; | 991 | char *helpname = NULL; |
991 | int err; | 992 | int err; |
992 | 993 | ||
993 | /* don't change helper of sibling connections */ | 994 | /* don't change helper of sibling connections */ |
@@ -1230,7 +1231,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[], | |||
1230 | 1231 | ||
1231 | rcu_read_lock(); | 1232 | rcu_read_lock(); |
1232 | if (cda[CTA_HELP]) { | 1233 | if (cda[CTA_HELP]) { |
1233 | char *helpname; | 1234 | char *helpname = NULL; |
1234 | 1235 | ||
1235 | err = ctnetlink_parse_help(cda[CTA_HELP], &helpname); | 1236 | err = ctnetlink_parse_help(cda[CTA_HELP], &helpname); |
1236 | if (err < 0) | 1237 | if (err < 0) |
@@ -1564,7 +1565,7 @@ static int ctnetlink_expect_event(struct notifier_block *this, | |||
1564 | 1565 | ||
1565 | skb = alloc_skb(NLMSG_GOODSIZE, GFP_ATOMIC); | 1566 | skb = alloc_skb(NLMSG_GOODSIZE, GFP_ATOMIC); |
1566 | if (!skb) | 1567 | if (!skb) |
1567 | return NOTIFY_DONE; | 1568 | goto errout; |
1568 | 1569 | ||
1569 | b = skb->tail; | 1570 | b = skb->tail; |
1570 | 1571 | ||
@@ -1589,8 +1590,9 @@ static int ctnetlink_expect_event(struct notifier_block *this, | |||
1589 | nla_put_failure: | 1590 | nla_put_failure: |
1590 | rcu_read_unlock(); | 1591 | rcu_read_unlock(); |
1591 | nlmsg_failure: | 1592 | nlmsg_failure: |
1592 | nfnetlink_set_err(0, 0, -ENOBUFS); | ||
1593 | kfree_skb(skb); | 1593 | kfree_skb(skb); |
1594 | errout: | ||
1595 | nfnetlink_set_err(0, 0, -ENOBUFS); | ||
1594 | return NOTIFY_DONE; | 1596 | return NOTIFY_DONE; |
1595 | } | 1597 | } |
1596 | #endif | 1598 | #endif |