From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [tip:ras/core] x86/MCE: Fix stack out-of-bounds write in mce-inject.c: Flags_read() From: tip-bot for Borislav Petkov Message-Id: Date: Sun, 6 May 2018 03:52:35 -0700 To: linux-tip-commits@vger.kernel.org Cc: dvyukov@google.com, tony.luck@intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, bp@suse.de, linux-edac@vger.kernel.org List-ID: Q29tbWl0LUlEOiAgOTg1Yzc4ZDNmZjhlOWM3NDQ1MGZhMmJiMDhlYjU1ZTY4MGQ5OTljYQpHaXR3 ZWI6ICAgICBodHRwczovL2dpdC5rZXJuZWwub3JnL3RpcC85ODVjNzhkM2ZmOGU5Yzc0NDUwZmEy YmIwOGViNTVlNjgwZDk5OWNhCkF1dGhvcjogICAgIEx1Y2ssIFRvbnkgPHRvbnkubHVja0BpbnRl bC5jb20+CkF1dGhvckRhdGU6IEZyaSwgMjcgQXByIDIwMTggMDk6Mzc6MDggLTA3MDAKQ29tbWl0 dGVyOiAgVGhvbWFzIEdsZWl4bmVyIDx0Z2x4QGxpbnV0cm9uaXguZGU+CkNvbW1pdERhdGU6IFN1 biwgNiBNYXkgMjAxOCAxMjo0NjozOSArMDIwMAoKeDg2L01DRTogRml4IHN0YWNrIG91dC1vZi1i b3VuZHMgd3JpdGUgaW4gbWNlLWluamVjdC5jOiBGbGFnc19yZWFkKCkKCkVhY2ggb2YgdGhlIHN0 cmluZ3MgdGhhdCB3ZSB3YW50IHRvIHB1dCBpbnRvIHRoZSBidWZbTUFYX0ZMQUdfT1BUX1NJWkVd CmluIGZsYWdzX3JlYWQoKSBpcyB0d28gY2hhcmFjdGVycyBsb25nLiBCdXQgdGhlIHNwcmludGYo KSBhZGRzCmEgdHJhaWxpbmcgbmV3bGluZSBhbmQgd2lsbCBhZGQgYSB0ZXJtaW5hdGluZyBOVUwg Ynl0ZS4gU28KTUFYX0ZMQUdfT1BUX1NJWkUgbmVlZHMgdG8gYmUgNC4KCnNwcmludGYoKSBjYWxs cyB2c25wcmludGYoKSBhbmQgKnRoYXQqIGRvZXMgcmV0dXJuOgoKIiAqIFRoZSByZXR1cm4gdmFs dWUgaXMgdGhlIG51bWJlciBvZiBjaGFyYWN0ZXJzIHdoaWNoIHdvdWxkCiAqIGJlIGdlbmVyYXRl ZCBmb3IgdGhlIGdpdmVuIGlucHV0LCBleGNsdWRpbmcgdGhlIHRyYWlsaW5nCiAqICdcMCcsIGFz IHBlciBJU08gQzk5LiIKCk5vdGUgdGhlICJleGNsdWRpbmciLgoKUmVwb3J0ZWQtYnk6IERtaXRy eSBWeXVrb3YgPGR2eXVrb3ZAZ29vZ2xlLmNvbT4KU2lnbmVkLW9mZi1ieTogVG9ueSBMdWNrIDx0 b255Lmx1Y2tAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBCb3Jpc2xhdiBQZXRrb3YgPGJwQHN1 c2UuZGU+ClNpZ25lZC1vZmYtYnk6IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRl PgpDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwpDYzogbGludXgtZWRhYyA8bGludXgtZWRhY0B2 Z2VyLmtlcm5lbC5vcmc+Ckxpbms6IGh0dHA6Ly9sa21sLmtlcm5lbC5vcmcvci8yMDE4MDQyNzE2 MzcwNy5rdGFpeXN2YmszeWhrNHdtQGFnbHVjay1kZXNrCi0tLQogYXJjaC94ODYva2VybmVsL2Nw dS9tY2hlY2svbWNlLWluamVjdC5jIHwgMiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9u KCspLCAxIGRlbGV0aW9uKC0pCgotLQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2Vu ZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtZWRhYyIgaW4KdGhlIGJvZHkgb2YgYSBtZXNz YWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9yZSBtYWpvcmRvbW8gaW5mbyBhdCAg aHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1sCgpkaWZmIC0tZ2l0IGEv YXJjaC94ODYva2VybmVsL2NwdS9tY2hlY2svbWNlLWluamVjdC5jIGIvYXJjaC94ODYva2VybmVs L2NwdS9tY2hlY2svbWNlLWluamVjdC5jCmluZGV4IDQ3NWNiNGY1ZjE0Zi4uYzgwNWEwNmUxNGMz IDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9rZXJuZWwvY3B1L21jaGVjay9tY2UtaW5qZWN0LmMKKysr IGIvYXJjaC94ODYva2VybmVsL2NwdS9tY2hlY2svbWNlLWluamVjdC5jCkBAIC00OCw3ICs0OCw3 IEBAIHN0YXRpYyBzdHJ1Y3QgZGVudHJ5ICpkZnNfaW5qOwogCiBzdGF0aWMgdTggbl9iYW5rczsK IAotI2RlZmluZSBNQVhfRkxBR19PUFRfU0laRQkzCisjZGVmaW5lIE1BWF9GTEFHX09QVF9TSVpF CTQKICNkZWZpbmUgTkJDRkcJCQkweDQ0CiAKIGVudW0gaW5qZWN0aW9uX3R5cGUgewo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751625AbeEFKwx (ORCPT ); Sun, 6 May 2018 06:52:53 -0400 Received: from terminus.zytor.com ([198.137.202.136]:38873 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750967AbeEFKwv (ORCPT ); Sun, 6 May 2018 06:52:51 -0400 Date: Sun, 6 May 2018 03:52:35 -0700 From: "tip-bot for Luck, Tony" Message-ID: Cc: dvyukov@google.com, tony.luck@intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, bp@suse.de, linux-edac@vger.kernel.org Reply-To: tony.luck@intel.com, dvyukov@google.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, bp@suse.de, hpa@zytor.com, mingo@kernel.org In-Reply-To: <20180427163707.ktaiysvbk3yhk4wm@agluck-desk> References: <20180427163707.ktaiysvbk3yhk4wm@agluck-desk> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/MCE: Fix stack out-of-bounds write in mce-inject.c: Flags_read() Git-Commit-ID: 985c78d3ff8e9c74450fa2bb08eb55e680d999ca X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 985c78d3ff8e9c74450fa2bb08eb55e680d999ca Gitweb: https://git.kernel.org/tip/985c78d3ff8e9c74450fa2bb08eb55e680d999ca Author: Luck, Tony AuthorDate: Fri, 27 Apr 2018 09:37:08 -0700 Committer: Thomas Gleixner CommitDate: Sun, 6 May 2018 12:46:39 +0200 x86/MCE: Fix stack out-of-bounds write in mce-inject.c: Flags_read() Each of the strings that we want to put into the buf[MAX_FLAG_OPT_SIZE] in flags_read() is two characters long. But the sprintf() adds a trailing newline and will add a terminating NUL byte. So MAX_FLAG_OPT_SIZE needs to be 4. sprintf() calls vsnprintf() and *that* does return: " * The return value is the number of characters which would * be generated for the given input, excluding the trailing * '\0', as per ISO C99." Note the "excluding". Reported-by: Dmitry Vyukov Signed-off-by: Tony Luck Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org Cc: linux-edac Link: http://lkml.kernel.org/r/20180427163707.ktaiysvbk3yhk4wm@agluck-desk --- arch/x86/kernel/cpu/mcheck/mce-inject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c index 475cb4f5f14f..c805a06e14c3 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-inject.c +++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c @@ -48,7 +48,7 @@ static struct dentry *dfs_inj; static u8 n_banks; -#define MAX_FLAG_OPT_SIZE 3 +#define MAX_FLAG_OPT_SIZE 4 #define NBCFG 0x44 enum injection_type {