mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-02 12:02:47 +00:00
[ATM]: Oops reading net/atm/arp
cat /proc/net/atm/arp causes the NULL pointer dereference in the get_proc_net+0xc/0x3a. This happens as proc_get_net believes that the parent proc dir entry contains struct net. Fix this assumption for "net/atm" case. The problem is introduced by the commit c0097b07abf5f92ab135d024dd41bd2aada1512f from Eric W. Biederman/Daniel Lezcano. Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
8cced9eff1
commit
e5d69b9f4a
3 changed files with 17 additions and 6 deletions
|
@ -476,7 +476,7 @@ static void atm_proc_dirs_remove(void)
|
|||
if (e->dirent)
|
||||
remove_proc_entry(e->name, atm_proc_root);
|
||||
}
|
||||
remove_proc_entry("atm", init_net.proc_net);
|
||||
proc_net_remove(&init_net, "atm");
|
||||
}
|
||||
|
||||
int __init atm_proc_init(void)
|
||||
|
@ -484,7 +484,7 @@ int __init atm_proc_init(void)
|
|||
static struct atm_proc_entry *e;
|
||||
int ret;
|
||||
|
||||
atm_proc_root = proc_mkdir("atm", init_net.proc_net);
|
||||
atm_proc_root = proc_net_mkdir(&init_net, "atm", init_net.proc_net);
|
||||
if (!atm_proc_root)
|
||||
goto err_out;
|
||||
for (e = atm_proc_ents; e->name; e++) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue