Subject: take#4: [PATCH] [ATM]: Add error handling for proc_create fail

From: Wang Chen <[email-masked]>
Date: Tue, 04 Mar 2008 15:27:41 +0800

Wang Chen said the following on 2008-3-3 16:46:
> David Miller said the following on 2008-3-3 13:09:
>> Sigh....
>>
>> I know you want to avoid all of the error handling unwind code, but
>> you can't do that in this situation.  It's not valid to register the
>> ATM clip procfs file without first initializing the ATM clip neighbour
>> table, so moving it up like this isn't going to work.
>>
>> They way you've done it, a user can open the procfs file and access
>> the datastructure before it's initialized properly.
>>
>> Please, simply add the necessary unregister code and leave the procfs
>> initialization where it currently is.
>>
>> I get the sense you really aren't reading this code carefully and
>> you're tossing these patches together as quickly as you can to just
>> get it done.  Please don't do that, it wastes both my time and
>> your's.
>>
> 
> No, I didn't read the code very carefully. Sorry for that.
> However, I don't think it's necessary to put procfs init after ioctl,
> although it's necessary to do clip procfs init after neighbour tbl init.
> If i am wrong, please correct me.
> 
> But I still put clip profs init where it was, because all the unregister
> can be done easily when I pick the code up to a static function called
> atm_clip_exit_noproc().
> 
> Here is the new patch.
> 

Hi, David, please ignore the previous patch. It's ugly and difficult to
understand.

Here is a new one.

---
When proc_create() fails, do some error handling work and return -ENOMEM.

Signed-off-by: Wang Chen <[email-masked]>
---
 net/atm/clip.c |   19 ++++++++++++++++---
 net/atm/lec.c  |    4 ++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/net/atm/clip.c b/net/atm/clip.c
index d30167c..2ab1e36 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -947,6 +947,8 @@ static const struct file_operations arp_seq_fops = {
 };
 #endif
 
+static void atm_clip_exit_noproc(void);
+
 static int __init atm_clip_init(void)
 {
 	neigh_table_init_no_netlink(&clip_tbl);
@@ -963,18 +965,22 @@ static int __init atm_clip_init(void)
 		struct proc_dir_entry *p;
 
 		p = proc_create("arp", S_IRUGO, atm_proc_root, &arp_seq_fops);
+		if (!p) {
+			printk(KERN_ERR "Unable to initialize "
+			       "/proc/net/atm/arp\n");
+			atm_clip_exit_noproc();
+			return -ENOMEM;
+		}
 	}
 #endif
 
 	return 0;
 }
 
-static void __exit atm_clip_exit(void)
+static void atm_clip_exit_noproc(void)
 {
 	struct net_device *dev, *next;
 
-	remove_proc_entry("arp", atm_proc_root);
-
 	unregister_inetaddr_notifier(&clip_inet_notifier);
 	unregister_netdevice_notifier(&clip_dev_notifier);
 
@@ -1005,6 +1011,13 @@ static void __exit atm_clip_exit(void)
 	clip_tbl_hook = NULL;
 }
 
+static void __exit atm_clip_exit(void)
+{
+	remove_proc_entry("arp", atm_proc_root);
+
+	atm_clip_exit_noproc();
+}
+
 module_init(atm_clip_init);
 module_exit(atm_clip_exit);
 MODULE_AUTHOR("Werner Almesberger");
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 0e450d1..a2efa7f 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -1250,6 +1250,10 @@ static int __init lane_module_init(void)
 	struct proc_dir_entry *p;
 
 	p = proc_create("lec", S_IRUGO, atm_proc_root, &lec_seq_fops);
+	if (!p) {
+		printk(KERN_ERR "Unable to initialize /proc/net/atm/lec\n");
+		return -ENOMEM;
+	}
 #endif
 
 	register_atm_ioctl(&lane_ioctl_ops);
-- 
WCN