diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-01-10 03:51:41 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:01:36 -0800 |
| commit | e5d69b9f4a6ce17f0d09595da45e37b870fee5ae (patch) | |
| tree | fa6ddbf9a5dbf674e8c7ec668edec2f36d34176a /fs/proc | |
| parent | 8cced9eff1d413c28efac9c5ac5a75793c9251cf (diff) | |
| download | linux-3.10-e5d69b9f4a6ce17f0d09595da45e37b870fee5ae.tar.gz linux-3.10-e5d69b9f4a6ce17f0d09595da45e37b870fee5ae.tar.bz2 linux-3.10-e5d69b9f4a6ce17f0d09595da45e37b870fee5ae.zip | |
[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>
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/proc_net.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c index cfc4f6c072f..4823c9677fa 100644 --- a/fs/proc/proc_net.c +++ b/fs/proc/proc_net.c @@ -96,6 +96,17 @@ static struct proc_dir_entry *proc_net_shadow(struct task_struct *task, return task->nsproxy->net_ns->proc_net; } +struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name, + struct proc_dir_entry *parent) +{ + struct proc_dir_entry *pde; + pde = proc_mkdir_mode(name, S_IRUGO | S_IXUGO, parent); + if (pde != NULL) + pde->data = net; + return pde; +} +EXPORT_SYMBOL_GPL(proc_net_mkdir); + static __net_init int proc_net_ns_init(struct net *net) { struct proc_dir_entry *root, *netd, *net_statd; @@ -107,18 +118,16 @@ static __net_init int proc_net_ns_init(struct net *net) goto out; err = -EEXIST; - netd = proc_mkdir("net", root); + netd = proc_net_mkdir(net, "net", root); if (!netd) goto free_root; err = -EEXIST; - net_statd = proc_mkdir("stat", netd); + net_statd = proc_net_mkdir(net, "stat", netd); if (!net_statd) goto free_net; root->data = net; - netd->data = net; - net_statd->data = net; net->proc_net_root = root; net->proc_net = netd; |