| Message ID | 20210309083356.24083-1-baijiaju1990@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | net: netlink: fix error return code of netlink_proto_init() | expand |
On 09.03.2021 09:33, Jia-Ju Bai wrote: > When kcalloc() returns NULL to nl_table, no error return code of > netlink_proto_init() is assigned. > To fix this bug, err is assigned with -ENOMEM in this case. > Didn't we talk enough about your incorrect patches yesterday? This one is incorrect again. panic() never returns. Stop sending patches until you understand the code you're changing! > Fixes: fab2caf62ed0 ("[NETLINK]: Call panic if nl_table allocation fails") > Reported-by: TOTE Robot <oslab@tsinghua.edu.cn> > Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com> > --- > net/netlink/af_netlink.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c > index dd488938447f..9ab66cfb1037 100644 > --- a/net/netlink/af_netlink.c > +++ b/net/netlink/af_netlink.c > @@ -2880,8 +2880,10 @@ static int __init netlink_proto_init(void) > BUILD_BUG_ON(sizeof(struct netlink_skb_parms) > sizeof_field(struct sk_buff, cb)); > > nl_table = kcalloc(MAX_LINKS, sizeof(*nl_table), GFP_KERNEL); > - if (!nl_table) > + if (!nl_table) { > + err = -ENOMEM; > goto panic; > + } > > for (i = 0; i < MAX_LINKS; i++) { > if (rhashtable_init(&nl_table[i].hash, >
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index dd488938447f..9ab66cfb1037 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -2880,8 +2880,10 @@ static int __init netlink_proto_init(void) BUILD_BUG_ON(sizeof(struct netlink_skb_parms) > sizeof_field(struct sk_buff, cb)); nl_table = kcalloc(MAX_LINKS, sizeof(*nl_table), GFP_KERNEL); - if (!nl_table) + if (!nl_table) { + err = -ENOMEM; goto panic; + } for (i = 0; i < MAX_LINKS; i++) { if (rhashtable_init(&nl_table[i].hash,
When kcalloc() returns NULL to nl_table, no error return code of netlink_proto_init() is assigned. To fix this bug, err is assigned with -ENOMEM in this case. Fixes: fab2caf62ed0 ("[NETLINK]: Call panic if nl_table allocation fails") Reported-by: TOTE Robot <oslab@tsinghua.edu.cn> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com> --- net/netlink/af_netlink.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)