Re: [PATCH][V2][Fix commit message] x86/RAS/mce_amd_inj: fix signed wrap around when decrementing index i

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Borislav Petkov <bp@suse.de>
Newsgroups	linux.kernel
Subject	Re: [PATCH][V2][Fix commit message] x86/RAS/mce_amd_inj: fix signed wrap around when decrementing index i
Date	Sat, 17 Sep 2016 09:40:02 +0200
Message-ID	<siioa-813-1@gated-at.bofh.it> (permalink)
References	<shZvh-40T-27@gated-at.bofh.it>
X-Original-To	Colin King <colin.king@canonical.com>
MIME-Version	1.0
Content-Type	text/plain; charset=utf-8
Content-Disposition	inline
Content-Transfer-Encoding	8bit
User-Agent	Mutt/1.6.0 (2016-04-01)
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	61
Organization	linux.* mail to news gateway
X-Original-Cc	Yazen Ghannam <Yazen.Ghannam@amd.com>, linux-kernel@vger.kernel.org, Aravind Gopalakrishnan <aravindksg.lkml@gmail.com>
X-Original-Date	Sat, 17 Sep 2016 09:35:11 +0200
X-Original-Message-ID	<20160917073511.GA29030@nazgul.tnic>
X-Original-References	<20160916112223.32398-1-colin.king@canonical.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1485491

Show key headers only | View raw

(drop peterz from CC).

On Fri, Sep 16, 2016 at 12:22:23PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Integer index i needs to be a signed int rather than unsigned to avoid
> a wrap-around when decrementing in the while loop.  For example, if the

Damn corner cases :-\

> 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 add (int) cast to fix warning that the original fix attempted
> to fix.

Thanks, that's a good catch!

But, can we keep the unsigned-ness of i as it is an index and do this
instead?

(Oh, and make it return ENODEV - that ENOMEM is just plain wrong most of
the time).

---
diff --git a/arch/x86/ras/mce_amd_inj.c b/arch/x86/ras/mce_amd_inj.c
index cd318d93099e..a2dafca467e6 100644
--- a/arch/x86/ras/mce_amd_inj.c
+++ b/arch/x86/ras/mce_amd_inj.c
@@ -457,8 +457,12 @@ static int __init init_mce_inject(void)
 						    &i_mce,
 						    dfs_fls[i].fops);
 
-		if (!dfs_fls[i].d)
+		if (!dfs_fls[i].d) {
+			if (!i)
+				return -ENODEV;
+
 			goto err_dfs_add;
+		}
 	}
 
 	return 0;
@@ -470,7 +474,7 @@ err_dfs_add:
 	debugfs_remove(dfs_inj);
 	dfs_inj = NULL;
 
-	return -ENOMEM;
+	return -ENODEV;
 }
 
 static void __exit exit_mce_inject(void)

-- 
Regards/Gruss,
    Boris.

SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--

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

Thread

[PATCH][V2][Fix commit message] x86/RAS/mce_amd_inj: fix signed wrap around when decrementing index i Colin King <colin.king@canonical.com> - 2016-09-16 13:30 +0200
  Re: [PATCH][V2][Fix commit message] x86/RAS/mce_amd_inj: fix signed  wrap around when decrementing index i Borislav Petkov <bp@suse.de> - 2016-09-17 09:40 +0200

csiph-web