diff options
Diffstat (limited to 'ipc/util.c')
| -rw-r--r-- | ipc/util.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/ipc/util.c b/ipc/util.c index d73b7af581e2..88adc329888c 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
| @@ -892,28 +892,16 @@ static const struct seq_operations sysvipc_proc_seqops = { | |||
| 892 | 892 | ||
| 893 | static int sysvipc_proc_open(struct inode *inode, struct file *file) | 893 | static int sysvipc_proc_open(struct inode *inode, struct file *file) |
| 894 | { | 894 | { |
| 895 | int ret; | ||
| 896 | struct seq_file *seq; | ||
| 897 | struct ipc_proc_iter *iter; | 895 | struct ipc_proc_iter *iter; |
| 898 | 896 | ||
| 899 | ret = -ENOMEM; | 897 | iter = __seq_open_private(file, &sysvipc_proc_seqops, sizeof(*iter)); |
| 900 | iter = kmalloc(sizeof(*iter), GFP_KERNEL); | ||
| 901 | if (!iter) | 898 | if (!iter) |
| 902 | goto out; | 899 | return -ENOMEM; |
| 903 | |||
| 904 | ret = seq_open(file, &sysvipc_proc_seqops); | ||
| 905 | if (ret) { | ||
| 906 | kfree(iter); | ||
| 907 | goto out; | ||
| 908 | } | ||
| 909 | |||
| 910 | seq = file->private_data; | ||
| 911 | seq->private = iter; | ||
| 912 | 900 | ||
| 913 | iter->iface = PDE_DATA(inode); | 901 | iter->iface = PDE_DATA(inode); |
| 914 | iter->ns = get_ipc_ns(current->nsproxy->ipc_ns); | 902 | iter->ns = get_ipc_ns(current->nsproxy->ipc_ns); |
| 915 | out: | 903 | |
| 916 | return ret; | 904 | return 0; |
| 917 | } | 905 | } |
| 918 | 906 | ||
| 919 | static int sysvipc_proc_release(struct inode *inode, struct file *file) | 907 | static int sysvipc_proc_release(struct inode *inode, struct file *file) |
