aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-01-10 06:51:41 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:01:36 -0500
commite5d69b9f4a6ce17f0d09595da45e37b870fee5ae (patch)
treefa6ddbf9a5dbf674e8c7ec668edec2f36d34176a /fs/proc
parent8cced9eff1d413c28efac9c5ac5a75793c9251cf (diff)
[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.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index cfc4f6c072f1..4823c9677fac 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,
96 return task->nsproxy->net_ns->proc_net; 96 return task->nsproxy->net_ns->proc_net;
97} 97}
98 98
99struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name,
100 struct proc_dir_entry *parent)
101{
102 struct proc_dir_entry *pde;
103 pde = proc_mkdir_mode(name, S_IRUGO | S_IXUGO, parent);
104 if (pde != NULL)
105 pde->data = net;
106 return pde;
107}
108EXPORT_SYMBOL_GPL(proc_net_mkdir);
109
99static __net_init int proc_net_ns_init(struct net *net) 110static __net_init int proc_net_ns_init(struct net *net)
100{ 111{
101 struct proc_dir_entry *root, *netd, *net_statd; 112 struct proc_dir_entry *root, *netd, *net_statd;
@@ -107,18 +118,16 @@ static __net_init int proc_net_ns_init(struct net *net)
107 goto out; 118 goto out;
108 119
109 err = -EEXIST; 120 err = -EEXIST;
110 netd = proc_mkdir("net", root); 121 netd = proc_net_mkdir(net, "net", root);
111 if (!netd) 122 if (!netd)
112 goto free_root; 123 goto free_root;
113 124
114 err = -EEXIST; 125 err = -EEXIST;
115 net_statd = proc_mkdir("stat", netd); 126 net_statd = proc_net_mkdir(net, "stat", netd);
116 if (!net_statd) 127 if (!net_statd)
117 goto free_net; 128 goto free_net;
118 129
119 root->data = net; 130 root->data = net;
120 netd->data = net;
121 net_statd->data = net;
122 131
123 net->proc_net_root = root; 132 net->proc_net_root = root;
124 net->proc_net = netd; 133 net->proc_net = netd;