[PATCH][V3] x86/RAS/mce_amd_inj: fix signed wrap around when decrementing index i

Path	csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	Colin King <colin.king@canonical.com>
Newsgroups	linux.kernel
Subject	[PATCH][V3] x86/RAS/mce_amd_inj: fix signed wrap around when decrementing index i
Date	Sat, 17 Sep 2016 12:30:02 +0200
Message-ID	<sil2G-1jm-13@gated-at.bofh.it> (permalink)
X-Original-To	Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H . Peter Anvin" <hpa@zytor.com>, x86@kernel.org, Borislav Petkov <bp@suse.de>, Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>, Yazen Ghannam <Yazen.Ghannam@amd.com>, Peter Zijlstra <peterz@infradead.org>
X-Mailer	git-send-email 2.9.3
MIME-Version	1.0
Content-Type	text/plain; charset="utf-8"
Content-Transfer-Encoding	8bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	41
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org
X-Original-Date	Sat, 17 Sep 2016 11:17:50 +0100
X-Original-Message-ID	<20160917101750.6436-1-colin.king@canonical.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1485517

Show key headers only | View raw

From: Colin Ian King <colin.king@canonical.com>

Change predecrement compare to post decrement compare to avoid an
unsigned integer wrap-around comparisomn when decrementing in the while
loop.

For example, if the debugfs_create_file fails when i is zero, the
current situation will predecrement i in the while loop, wrapping i
to the maximum signed integer and cause multiple out of bounds reads
on dfs_fls[i].d as the loop interates to zero.

Also, as Borislav Petkov suggested, return -ENODEV rather than -ENOMEM
on the error condition.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 arch/x86/ras/mce_amd_inj.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/ras/mce_amd_inj.c b/arch/x86/ras/mce_amd_inj.c
index cd318d9..20b227f 100644
--- a/arch/x86/ras/mce_amd_inj.c
+++ b/arch/x86/ras/mce_amd_inj.c
@@ -464,13 +464,13 @@ static int __init init_mce_inject(void)
 	return 0;
 
 err_dfs_add:
-	while (--i >= 0)
+	while (i-- > 0)
 		debugfs_remove(dfs_fls[i].d);
 
 	debugfs_remove(dfs_inj);
 	dfs_inj = NULL;
 
-	return -ENOMEM;
+	return -ENODEV;
 }
 
 static void __exit exit_mce_inject(void)
-- 
2.9.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH][V3] x86/RAS/mce_amd_inj: fix signed wrap around when decrementing index i Colin King <colin.king@canonical.com> - 2016-09-17 12:30 +0200
  Re: [PATCH][V3] x86/RAS/mce_amd_inj: fix signed wrap around when  decrementing index i Borislav Petkov <bp@suse.de> - 2016-09-19 20:00 +0200

csiph-web