diff options
| author | Sabrina Dubroca <sd@queasysnail.net> | 2018-06-05 15:02:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-05 18:26:41 +0200 |
| commit | e783bb00ad86d9d1f01d9d3a750713070036358e (patch) | |
| tree | fa99178b6e542947b12b3cf462aed019bf2fcdfe /net/ipv4/metrics.c | |
| parent | ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table succeeds (diff) | |
| download | linux-e783bb00ad86d9d1f01d9d3a750713070036358e.tar.xz linux-e783bb00ad86d9d1f01d9d3a750713070036358e.zip | |
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>
Diffstat (limited to 'net/ipv4/metrics.c')
0 files changed, 0 insertions, 0 deletions