Skip to content

Commit

Permalink
svcrpc: take lock on turning entry NEGATIVE in cache_check
Browse files Browse the repository at this point in the history
We attempt to turn a cache entry negative in place.  But that entry may
already have been filled in by some other task since we last checked
whether it was valid, so we could be modifying an already-valid entry.
If nothing else there's a likely leak in such a case when the entry is
eventually put() and contents are not freed because it has
CACHE_NEGATIVE set.

So, take the cache_lock just as sunrpc_cache_update() does.

Reviewed-by: NeilBrown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
  • Loading branch information
J. Bruce Fields committed Jan 4, 2011
1 parent da165dd commit 6bab93f
Showing 1 changed file with 18 additions and 7 deletions.
25 changes: 18 additions & 7 deletions net/sunrpc/cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,23 @@ static inline int cache_is_valid(struct cache_detail *detail, struct cache_head
}
}

static int try_to_negate_entry(struct cache_detail *detail, struct cache_head *h)
{
int rv;

write_lock(&detail->hash_lock);
rv = cache_is_valid(detail, h);
if (rv != -EAGAIN) {
write_unlock(&detail->hash_lock);
return rv;
}
set_bit(CACHE_NEGATIVE, &h->flags);
cache_fresh_locked(h, seconds_since_boot()+CACHE_NEW_EXPIRY);
write_unlock(&detail->hash_lock);
cache_fresh_unlocked(h, detail);
return -ENOENT;
}

/*
* This is the generic cache management routine for all
* the authentication caches.
Expand Down Expand Up @@ -251,14 +268,8 @@ int cache_check(struct cache_detail *detail,
case -EINVAL:
clear_bit(CACHE_PENDING, &h->flags);
cache_revisit_request(h);
if (rv == -EAGAIN) {
set_bit(CACHE_NEGATIVE, &h->flags);
cache_fresh_locked(h, seconds_since_boot()+CACHE_NEW_EXPIRY);
cache_fresh_unlocked(h, detail);
rv = -ENOENT;
}
rv = try_to_negate_entry(detail, h);
break;

case -EAGAIN:
clear_bit(CACHE_PENDING, &h->flags);
cache_revisit_request(h);
Expand Down

0 comments on commit 6bab93f

Please sign in to comment.