OSDN Git Service

ipmr: fix error path when ipmr_new_table fails
authorSabrina Dubroca <sd@queasysnail.net>
Tue, 5 Jun 2018 13:02:00 +0000 (15:02 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Jun 2018 16:26:41 +0000 (12:26 -0400)
commite783bb00ad86d9d1f01d9d3a750713070036358e
treefa99178b6e542947b12b3cf462aed019bf2fcdfe
parent848235edb5c93ed086700584c8ff64f6d7fc778d
ipmr: fix error path when ipmr_new_table fails

commit 0bbbf0e7d0e7 ("ipmr, ip6mr: Unite creation of new mr_table")
refactored ipmr_new_table, so that it now returns NULL when
mr_table_alloc fails. Unfortunately, all callers of ipmr_new_table
expect an ERR_PTR.

This can result in NULL deref, for example when ipmr_rules_exit calls
ipmr_free_table with NULL net->ipv4.mrt in the
!CONFIG_IP_MROUTE_MULTIPLE_TABLES version.

This patch makes mr_table_alloc return errors, and changes
ip6mr_new_table and its callers to return/expect error pointers as
well. It also removes the version of mr_table_alloc defined under
!CONFIG_IP_MROUTE_COMMON, since it is never used.

Fixes: 0bbbf0e7d0e7 ("ipmr, ip6mr: Unite creation of new mr_table")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/mroute_base.h
net/ipv4/ipmr_base.c
net/ipv6/ip6mr.c