Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751162Ab3HSQat (ORCPT ); Mon, 19 Aug 2013 12:30:49 -0400 Received: from mail-we0-f181.google.com ([74.125.82.181]:33492 "EHLO mail-we0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751113Ab3HSQas (ORCPT ); Mon, 19 Aug 2013 12:30:48 -0400 From: Richard Genoud To: Al Viro Cc: Andrew Morton , Linus Torvalds , linux-kernel@vger.kernel.org, Richard Genoud Subject: [PATCH] proc: return on proc_readdir error Date: Mon, 19 Aug 2013 18:30:31 +0200 Message-Id: <1376929831-18214-1-git-send-email-richard.genoud@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1707 Lines: 47 commit f0c3b5093addc8bfe9fe3a5b01acb7ec7969eafa "[readdir] convert procfs" introduced a bug on the listing of the proc file-system. The return value of proc_readdir() isn't tested anymore in the proc_root_readdir function. This lead to an "interesting" behaviour when we are using the getdents() system call with a buffer too small: Instead of failing, it returns the first entries of /proc (enough to fill the given buffer), plus the PID directories. This is not triggered on glibc (as getdents is called with a 32KB buffer), but on uclibc, the buffer size is only 1KB, thus some proc entries are missing. (described more in details here: https://lkml.org/lkml/2013/8/12/288 ) Signed-off-by: Richard Genoud --- [added Linus Torvalds and Andrew Morton in CC since Al Viro seems to be on holidays and it's starting to getting late in the -rc cycles] fs/proc/root.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/proc/root.c b/fs/proc/root.c index 229e366..e0a790d 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -205,7 +205,9 @@ static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentr static int proc_root_readdir(struct file *file, struct dir_context *ctx) { if (ctx->pos < FIRST_PROCESS_ENTRY) { - proc_readdir(file, ctx); + int error = proc_readdir(file, ctx); + if (unlikely(error <= 0)) + return error; ctx->pos = FIRST_PROCESS_ENTRY; } -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/