From: Stefani Seibold <stefani@seibold.net>
Date: Sat, 16 Jan 2010 01:01:02 +0000 (-0800)
Subject: kfifo: fix kfifo_out_locked race bug
X-Git-Tag: v2.6.33-rc5~61
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e105057a34c83cea542dacc55ff0528bce67afa;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

kfifo: fix kfifo_out_locked race bug

Fix a wrong optimization in include/linux/kfifo.h which could cause a race
in kfifo_out_locked.

Signed-off-by: Stefani Seibold <stefani@seibold.net>
Reported-by: Johan Hovold <jhovold@gmail.com>
Cc: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h
index 7c6b32a1..c4ac88b 100644
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
@@ -228,13 +228,6 @@ static inline __must_check unsigned int kfifo_out_locked(struct kfifo *fifo,
 
 	ret = kfifo_out(fifo, to, n);
 
-	/*
-	 * optimization: if the FIFO is empty, set the indices to 0
-	 * so we don't wrap the next time
-	 */
-	if (kfifo_is_empty(fifo))
-		kfifo_reset(fifo);
-
 	spin_unlock_irqrestore(lock, flags);
 
 	return ret;