diff options
| author | Andrew Morton <akpm@digeo.com> | 2003-01-10 18:40:20 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@are.twiddle.net> | 2003-01-10 18:40:20 -0800 |
| commit | 0c682373f4cfaf66f02959e8ff6b313d1eec44bc (patch) | |
| tree | 7c69356ac779ef151cdf8747b0b623e7ddbddba0 | |
| parent | 2faf433864abcc7337ff731ea04d5a6fc98d8247 (diff) | |
[PATCH] misc fixes
- Fix error-path mem leak in __vfs_follow_link() (From a recent AC->2.4
patch)
- Make drivers/net/aironet4500_proc.c:driver_lock static.
| -rw-r--r-- | drivers/net/aironet4500_proc.c | 2 | ||||
| -rw-r--r-- | fs/namei.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/aironet4500_proc.c b/drivers/net/aironet4500_proc.c index 42bc6c9d0046..3812bac1ceec 100644 --- a/drivers/net/aironet4500_proc.c +++ b/drivers/net/aironet4500_proc.c @@ -42,7 +42,7 @@ #define DEV_AWC_INFO 1 #define DEV_AWC 1 -spinlock_t driver_lock = SPIN_LOCK_UNLOCKED; +static spinlock_t driver_lock = SPIN_LOCK_UNLOCKED; struct awc_proc_private{ struct ctl_table_header * sysctl_header; diff --git a/fs/namei.c b/fs/namei.c index e3d12fc50452..2dbd2642362c 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2128,8 +2128,10 @@ out: * bloody create() on broken symlinks. Furrfu... */ name = __getname(); - if (!name) + if (unlikely(!name)) { + path_release(nd); return -ENOMEM; + } strcpy(name, nd->last.name); nd->last.name = name; return 0; |