netfilter: xtables: do not print any messages on ENOMEM

ENOMEM is a very obvious error code (cf. EINVAL), so I think we do not
really need a warning message. Not to mention that if the allocation
fails, the user is most likely going to get a stack trace from slab
already.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index c6ac657074a6b6471a1bb554fe7bb123ed676944..84340ab30ed3487759d7f5210d7271a6917b163a 100644 (file)
--- 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)
        ebtulognl = netlink_kernel_create(&init_net, NETLINK_NFLOG,
                                          EBT_ULOG_MAXNLGROUPS, NULL, NULL,
                                          THIS_MODULE);
-       if (!ebtulognl) {
-               printk(KERN_WARNING KBUILD_MODNAME ": out of memory trying to "
-                      "call netlink_kernel_create\n");
+       if (!ebtulognl)
                ret = -ENOMEM;
-       } else if ((ret = xt_register_target(&ebt_ulog_tg_reg)) != 0) {
+       else if ((ret = xt_register_target(&ebt_ulog_tg_reg)) != 0)
                netlink_kernel_release(ebtulognl);
-       }
 
        if (ret == 0)
                nf_log_register(NFPROTO_BRIDGE, &ebt_ulog_logger);

diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
index f86dc52367b1312effe0becb027231beadcbd789..0d6c2885ebd6797f42a35e72f618cc9c6bcd9c95 100644 (file)
--- 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)
        }
 
        ledinternal = kzalloc(sizeof(struct xt_led_info_internal), GFP_KERNEL);
-       if (!ledinternal) {
-               printk(KERN_CRIT KBUILD_MODNAME ": out of memory\n");
+       if (!ledinternal)
                return false;
-       }
 
        ledinternal->netfilter_led_trigger.name = ledinfo->id;
 

diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 1fdb50a90f1cb79634446603a7500e3ac700f715..52327c5c1f1d17b6440809bf6bd5714c4db2dd31 100644 (file)
--- 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_
        /* FIXME: don't use vmalloc() here or anywhere else -HW */
        hinfo = vmalloc(sizeof(struct xt_hashlimit_htable) +
                        sizeof(struct list_head) * size);
-       if (!hinfo) {
-               printk(KERN_ERR "xt_hashlimit: unable to create hashtable\n");
+       if (!hinfo)
                return -1;
-       }
        minfo->hinfo = hinfo;
 
        /* copy match config into hashtable config */
@@ -288,10 +286,8 @@ static int htable_create(struct net *net, struct xt_hashlimit_mtinfo1 *minfo,
        /* FIXME: don't use vmalloc() here or anywhere else -HW */
        hinfo = vmalloc(sizeof(struct xt_hashlimit_htable) +
                        sizeof(struct list_head) * size);
-       if (hinfo == NULL) {
-               printk(KERN_ERR "xt_hashlimit: unable to create hashtable\n");
+       if (hinfo == NULL)
                return -1;
-       }
        minfo->hinfo = hinfo;
 
        /* copy match config into hashtable config */

diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
index d8c0f8f1a78e3a2c5c6ae96edb94f76258a410cf..51ac1bbb4f52a2078368832195a1c42097442a7b 100644 (file)
--- 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)
                return false;
 
        info->master = kzalloc(sizeof(*info->master), GFP_KERNEL);
-       if (info->master == NULL) {
-               printk(KERN_ERR KBUILD_MODNAME ": Out of memory\n");
+       if (info->master == NULL)
                return false;
-       }
        info->master->count = info->u.nth.count;
 
        return true;