* call panic if nl_table allocation fails
@ 2006-08-23 11:37 Akinobu Mita
2006-08-23 14:06 ` James Morris
2006-08-29 9:15 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Akinobu Mita @ 2006-08-23 11:37 UTC (permalink / raw)
To: linux-kernel, netdev; +Cc: Patrick McHardy, David Miller, akpm
This patch makes crash happen if initialization of nl_table fails
in initcalls. It is better than getting use after free crash later.
Cc: Patrick McHardy <kaber@trash.net>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
Index: work-failmalloc/net/netlink/af_netlink.c
===================================================================
--- work-failmalloc.orig/net/netlink/af_netlink.c
+++ work-failmalloc/net/netlink/af_netlink.c
@@ -1273,8 +1273,7 @@ netlink_kernel_create(int unit, unsigned
struct netlink_sock *nlk;
unsigned long *listeners = NULL;
- if (!nl_table)
- return NULL;
+ BUG_ON(!nl_table);
if (unit<0 || unit>=MAX_LINKS)
return NULL;
@@ -1745,11 +1744,8 @@ static int __init netlink_proto_init(voi
netlink_skb_parms_too_large();
nl_table = kcalloc(MAX_LINKS, sizeof(*nl_table), GFP_KERNEL);
- if (!nl_table) {
-enomem:
- printk(KERN_CRIT "netlink_init: Cannot allocate nl_table\n");
- return -ENOMEM;
- }
+ if (!nl_table)
+ goto panic;
if (num_physpages >= (128 * 1024))
max = num_physpages >> (21 - PAGE_SHIFT);
@@ -1769,7 +1765,7 @@ enomem:
nl_pid_hash_free(nl_table[i].hash.table,
1 * sizeof(*hash->table));
kfree(nl_table);
- goto enomem;
+ goto panic;
}
memset(hash->table, 0, 1 * sizeof(*hash->table));
hash->max_shift = order;
@@ -1786,6 +1782,8 @@ enomem:
rtnetlink_init();
out:
return err;
+panic:
+ panic("netlink_init: Cannot allocate nl_table\n");
}
core_initcall(netlink_proto_init);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: call panic if nl_table allocation fails
2006-08-23 11:37 call panic if nl_table allocation fails Akinobu Mita
@ 2006-08-23 14:06 ` James Morris
2006-08-23 14:17 ` Patrick McHardy
2006-08-29 9:15 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: James Morris @ 2006-08-23 14:06 UTC (permalink / raw)
To: Akinobu Mita; +Cc: linux-kernel, netdev, Patrick McHardy, David Miller, akpm
On Wed, 23 Aug 2006, Akinobu Mita wrote:
> This patch makes crash happen if initialization of nl_table fails
> in initcalls. It is better than getting use after free crash later.
> nl_table = kcalloc(MAX_LINKS, sizeof(*nl_table), GFP_KERNEL);
Perhaps it'd be better to declare this as an array rather than allocating
it at runtime.
- James
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: call panic if nl_table allocation fails
2006-08-23 14:06 ` James Morris
@ 2006-08-23 14:17 ` Patrick McHardy
0 siblings, 0 replies; 4+ messages in thread
From: Patrick McHardy @ 2006-08-23 14:17 UTC (permalink / raw)
To: James Morris; +Cc: Akinobu Mita, linux-kernel, netdev, David Miller, akpm
James Morris wrote:
> On Wed, 23 Aug 2006, Akinobu Mita wrote:
>
>
>>This patch makes crash happen if initialization of nl_table fails
>>in initcalls. It is better than getting use after free crash later.
>
>
>> nl_table = kcalloc(MAX_LINKS, sizeof(*nl_table), GFP_KERNEL);
>
>
> Perhaps it'd be better to declare this as an array rather than allocating
> it at runtime.
That would still leave the MAX_LINKS allocations for the pid hashes
which need to be allocated because they are dynamically sized. We
could delay the pid hash allocations until the first bind happens
of course, but I doubt it would be worth it since they start with
just a single bucket.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: call panic if nl_table allocation fails
2006-08-23 11:37 call panic if nl_table allocation fails Akinobu Mita
2006-08-23 14:06 ` James Morris
@ 2006-08-29 9:15 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2006-08-29 9:15 UTC (permalink / raw)
To: mita; +Cc: linux-kernel, netdev, kaber, akpm
From: Akinobu Mita <mita@miraclelinux.com>
Date: Wed, 23 Aug 2006 20:37:40 +0900
> This patch makes crash happen if initialization of nl_table fails
> in initcalls. It is better than getting use after free crash later.
>
> Cc: Patrick McHardy <kaber@trash.net>
> Cc: David Miller <davem@davemloft.net>
> Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
Patch applied, thank you.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-08-29 9:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-08-23 11:37 call panic if nl_table allocation fails Akinobu Mita
2006-08-23 14:06 ` James Morris
2006-08-23 14:17 ` Patrick McHardy
2006-08-29 9:15 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).