patch-2.4.10 linux/net/ipv4/netfilter/ip_fw_compat_masq.c
Next file: linux/net/ipv4/netfilter/ip_nat_helper.c
Previous file: linux/net/ipv4/netfilter/ip_conntrack_standalone.c
Back to the patch index
Back to the overall index
- Lines: 34
- Date:
Fri Sep 14 14:04:08 2001
- Orig file:
v2.4.9/linux/net/ipv4/netfilter/ip_fw_compat_masq.c
- Orig date:
Mon Sep 18 15:09:55 2000
diff -u --recursive --new-file v2.4.9/linux/net/ipv4/netfilter/ip_fw_compat_masq.c linux/net/ipv4/netfilter/ip_fw_compat_masq.c
@@ -14,6 +14,7 @@
#include <linux/inetdevice.h>
#include <linux/proc_fs.h>
#include <linux/version.h>
+#include <linux/module.h>
#include <net/route.h>
#define ASSERT_READ_LOCK(x) MUST_BE_READ_LOCKED(&ip_conntrack_lock)
@@ -302,13 +303,22 @@
int __init masq_init(void)
{
int ret;
+ struct proc_dir_entry *proc;
ret = ip_conntrack_init();
if (ret == 0) {
ret = ip_nat_init();
- if (ret == 0)
- proc_net_create("ip_masquerade", 0, masq_procinfo);
- else
+ if (ret == 0) {
+ proc = proc_net_create("ip_masquerade",
+ 0, masq_procinfo);
+ if (proc)
+ proc->owner = THIS_MODULE;
+ else {
+ ip_nat_cleanup();
+ ip_conntrack_cleanup();
+ ret = -ENOMEM;
+ }
+ } else
ip_conntrack_cleanup();
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)