The patch titled kfifo: fix kfifo_out_locked race bug has been added to the -mm tree. Its filename is kfifo-fix-kfifo_out_locked-race-bug.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: kfifo: fix kfifo_out_locked race bug From: Stefani Seibold <stefani@xxxxxxxxxxx> Fix a wrong optimization in include/linux/kfifo.h which could cause a race in kfifo_out_locked. Signed-off-by: Stefani Seibold <stefani@xxxxxxxxxxx> Reported-by: Johan Hovold <jhovold@xxxxxxxxx> Cc: Pete Zaitcev <zaitcev@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/kfifo.h | 7 ------- 1 file changed, 7 deletions(-) diff -puN include/linux/kfifo.h~kfifo-fix-kfifo_out_locked-race-bug include/linux/kfifo.h --- a/include/linux/kfifo.h~kfifo-fix-kfifo_out_locked-race-bug +++ a/include/linux/kfifo.h @@ -228,13 +228,6 @@ static inline __must_check unsigned int 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; _ Patches currently in -mm which might be from stefani@xxxxxxxxxxx are proc-revert-procfs-provide-stack-information-for-threads.patch kfifo-fix-kfifo_out_locked-race-bug.patch kfifo-use-void-pointers-for-user-buffers.patch kfifo-sanitize-_user-error-handling.patch kfifo-add-kfifo_out_peek.patch kfifo-add-kfifo_initialized.patch kfifo-document-everywhere-that-size-has-to-be-power-of-two.patch linux-next.patch drivers-media-video-cx23885-needs-kfifo-conversion.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html