luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: xtables: do not print any messages on ENOMEM

Browse Source 
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>
This commit is contained in:
Jan Engelhardt 2010-03-18 00:27:03 +01:00
parent f5c511c67a
commit 85bc3f3814
4 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/bridge/netfilter/ebt_ulog.c
View File

@ -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);

4
net/netfilter/xt_LED.c
View File

@ -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;

8
net/netfilter/xt_hashlimit.c
View File

@ -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 */

4
net/netfilter/xt_statistic.c
View File

@ -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;