[PATCH for stable] Re: [Fwd: moradin 2006-08-02 11:02 System Events]

[PATCH for stable] Re: [Fwd: moradin 2006-08-02 11:02 System Events]

[Neil Brown]

On Wednesday August 2, pmhahn@svs.Informatik.Uni-Oldenburg.de wrote:
> Hello!
> 
> Rebooting one of our NFS file servers with 2.6.17.7, I just got the
> following OOPS:

Thanks for the report.
The bug was fairly easy to find and fix.
I think this would be appropriate for the next 2.6.17.x stable kernel,
and definitely for 2.6.18. (hence 'akpm' and 'stable' cc:ed).

It is not relevant for earlier kernels (e.g. 2.6.16).

Patch was made against 2.6.18-rc2-mm1, but applies equally to
2.6.17.7.

Thanks again,
NeilBrown


---------------------------------------------
Fix race related problem when adding items to and svcrpc auth cache.

If we don't find the item we are lookng for, we allocate a new one,
and then grab the lock again and search to see if it has been added
while we did the alloc.
If it had been added we need to 'cache_put' the newly created item 
that we are never going to use.  But as it hasn't been initialised
properly, putting it can cause an oops.

So move the ->init call earlier to that it will always be fully
initilised if we have to put it.

Thanks to Philipp Matthias Hahn <pmhahn@svs.Informatik.Uni-Oldenburg.de>
for reporting the problem.

Signed-off-by: Neil Brown <neilb@suse.de>

### Diffstat output
 ./net/sunrpc/cache.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff .prev/net/sunrpc/cache.c ./net/sunrpc/cache.c
--- .prev/net/sunrpc/cache.c	2006-08-03 10:07:33.000000000 +1000
+++ ./net/sunrpc/cache.c	2006-08-03 10:08:36.000000000 +1000
@@ -71,7 +71,12 @@ struct cache_head *sunrpc_cache_lookup(s
 	new = detail->alloc();
 	if (!new)
 		return NULL;
+	/* must fully initialise 'new', else
+	 * we might get lose if we need to
+	 * cache_put it soon.
+	 */
 	cache_init(new);
+	detail->init(new, key);
 
 	write_lock(&detail->hash_lock);
 
@@ -85,7 +90,6 @@ struct cache_head *sunrpc_cache_lookup(s
 			return tmp;
 		}
 	}
-	detail->init(new, key);
 	new->next = *head;
 	*head = new;
 	detail->entries++;

Re: [stable] [PATCH for stable] Re: [Fwd: moradin 2006-08-02 11:02 System Events]

[Greg KH]

On Thu, Aug 03, 2006 at 10:20:12AM +1000, Neil Brown wrote:
> On Wednesday August 2, pmhahn@svs.Informatik.Uni-Oldenburg.de wrote:
> > Hello!
> > 
> > Rebooting one of our NFS file servers with 2.6.17.7, I just got the
> > following OOPS:
> 
> Thanks for the report.
> The bug was fairly easy to find and fix.
> I think this would be appropriate for the next 2.6.17.x stable kernel,
> and definitely for 2.6.18. (hence 'akpm' and 'stable' cc:ed).
> 
> It is not relevant for earlier kernels (e.g. 2.6.16).
> 
> Patch was made against 2.6.18-rc2-mm1, but applies equally to
> 2.6.17.7.

Queued to -stable.

thanks,

greg k-h