diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-10 06:51:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:01:36 -0500 |
commit | e5d69b9f4a6ce17f0d09595da45e37b870fee5ae (patch) | |
tree | fa6ddbf9a5dbf674e8c7ec668edec2f36d34176a /include/linux | |
parent | 8cced9eff1d413c28efac9c5ac5a75793c9251cf (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 'include/linux')
-rw-r--r-- | include/linux/proc_fs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index a5316829215b..8f92546b403d 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h | |||
@@ -201,6 +201,8 @@ static inline struct proc_dir_entry *create_proc_info_entry(const char *name, | |||
201 | extern struct proc_dir_entry *proc_net_fops_create(struct net *net, | 201 | extern struct proc_dir_entry *proc_net_fops_create(struct net *net, |
202 | const char *name, mode_t mode, const struct file_operations *fops); | 202 | const char *name, mode_t mode, const struct file_operations *fops); |
203 | extern void proc_net_remove(struct net *net, const char *name); | 203 | extern void proc_net_remove(struct net *net, const char *name); |
204 | extern struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name, | ||
205 | struct proc_dir_entry *parent); | ||
204 | 206 | ||
205 | #else | 207 | #else |
206 | 208 | ||