aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/bridge/netfilter/ebt_ulog.c7
-rw-r--r--net/netfilter/xt_LED.c4
-rw-r--r--net/netfilter/xt_hashlimit.c8
-rw-r--r--net/netfilter/xt_statistic.c4
4 files changed, 6 insertions, 17 deletions
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index c6ac657074a6..84340ab30ed3 100644
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -305,13 +305,10 @@ static int __init ebt_ulog_init(void)
305 ebtulognl = netlink_kernel_create(&init_net, NETLINK_NFLOG, 305 ebtulognl = netlink_kernel_create(&init_net, NETLINK_NFLOG,
306 EBT_ULOG_MAXNLGROUPS, NULL, NULL, 306 EBT_ULOG_MAXNLGROUPS, NULL, NULL,
307 THIS_MODULE); 307 THIS_MODULE);
308 if (!ebtulognl) { 308 if (!ebtulognl)
309 printk(KERN_WARNING KBUILD_MODNAME ": out of memory trying to "
310 "call netlink_kernel_create\n");
311 ret = -ENOMEM; 309 ret = -ENOMEM;
312 } else if ((ret = xt_register_target(&ebt_ulog_tg_reg)) != 0) { 310 else if ((ret = xt_register_target(&ebt_ulog_tg_reg)) != 0)
313 netlink_kernel_release(ebtulognl); 311 netlink_kernel_release(ebtulognl);
314 }
315 312
316 if (ret == 0) 313 if (ret == 0)
317 nf_log_register(NFPROTO_BRIDGE, &ebt_ulog_logger); 314 nf_log_register(NFPROTO_BRIDGE, &ebt_ulog_logger);
diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
index f86dc52367b1..0d6c2885ebd6 100644
--- a/net/netfilter/xt_LED.c
+++ b/net/netfilter/xt_LED.c
@@ -92,10 +92,8 @@ static bool led_tg_check(const struct xt_tgchk_param *par)
92 } 92 }
93 93
94 ledinternal = kzalloc(sizeof(struct xt_led_info_internal), GFP_KERNEL); 94 ledinternal = kzalloc(sizeof(struct xt_led_info_internal), GFP_KERNEL);
95 if (!ledinternal) { 95 if (!ledinternal)
96 printk(KERN_CRIT KBUILD_MODNAME ": out of memory\n");
97 return false; 96 return false;
98 }
99 97
100 ledinternal->netfilter_led_trigger.name = ledinfo->id; 98 ledinternal->netfilter_led_trigger.name = ledinfo->id;
101 99
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 1fdb50a90f1c..52327c5c1f1d 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -215,10 +215,8 @@ static int htable_create_v0(struct net *net, struct xt_hashlimit_info *minfo, u_
215 /* FIXME: don't use vmalloc() here or anywhere else -HW */ 215 /* FIXME: don't use vmalloc() here or anywhere else -HW */
216 hinfo = vmalloc(sizeof(struct xt_hashlimit_htable) + 216 hinfo = vmalloc(sizeof(struct xt_hashlimit_htable) +
217 sizeof(struct list_head) * size); 217 sizeof(struct list_head) * size);
218 if (!hinfo) { 218 if (!hinfo)
219 printk(KERN_ERR "xt_hashlimit: unable to create hashtable\n");
220 return -1; 219 return -1;
221 }
222 minfo->hinfo = hinfo; 220 minfo->hinfo = hinfo;
223 221
224 /* copy match config into hashtable config */ 222 /* copy match config into hashtable config */
@@ -288,10 +286,8 @@ static int htable_create(struct net *net, struct xt_hashlimit_mtinfo1 *minfo,
288 /* FIXME: don't use vmalloc() here or anywhere else -HW */ 286 /* FIXME: don't use vmalloc() here or anywhere else -HW */
289 hinfo = vmalloc(sizeof(struct xt_hashlimit_htable) + 287 hinfo = vmalloc(sizeof(struct xt_hashlimit_htable) +
290 sizeof(struct list_head) * size); 288 sizeof(struct list_head) * size);
291 if (hinfo == NULL) { 289 if (hinfo == NULL)
292 printk(KERN_ERR "xt_hashlimit: unable to create hashtable\n");
293 return -1; 290 return -1;
294 }
295 minfo->hinfo = hinfo; 291 minfo->hinfo = hinfo;
296 292
297 /* copy match config into hashtable config */ 293 /* copy match config into hashtable config */
diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
index d8c0f8f1a78e..51ac1bbb4f52 100644
--- a/net/netfilter/xt_statistic.c
+++ b/net/netfilter/xt_statistic.c
@@ -61,10 +61,8 @@ static bool statistic_mt_check(const struct xt_mtchk_param *par)
61 return false; 61 return false;
62 62
63 info->master = kzalloc(sizeof(*info->master), GFP_KERNEL); 63 info->master = kzalloc(sizeof(*info->master), GFP_KERNEL);
64 if (info->master == NULL) { 64 if (info->master == NULL)
65 printk(KERN_ERR KBUILD_MODNAME ": Out of memory\n");
66 return false; 65 return false;
67 }
68 info->master->count = info->u.nth.count; 66 info->master->count = info->u.nth.count;
69 67
70 return true; 68 return true;