From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755380AbdKAVGx (ORCPT ); Wed, 1 Nov 2017 17:06:53 -0400 Received: from terminus.zytor.com ([65.50.211.136]:60751 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755311AbdKAVGt (ORCPT ); Wed, 1 Nov 2017 17:06:49 -0400 Date: Wed, 1 Nov 2017 13:58:52 -0700 From: tip-bot for Ricardo Neri Message-ID: Cc: jslaby@suse.cz, acme@redhat.com, shuah@kernel.org, pbonzini@redhat.com, dave.hansen@linux.intel.com, peterz@infradead.org, hpa@zytor.com, keescook@chromium.org, ray.huang@amd.com, slaoub@gmail.com, adrian.hunter@intel.com, qiaowei.ren@intel.com, mst@redhat.com, ravi.v.shankar@intel.com, akpm@linux-foundation.org, cmetcalf@mellanox.com, dvyukov@google.com, mhiramat@kernel.org, linux-kernel@vger.kernel.org, brgerst@gmail.com, mingo@kernel.org, lstoakes@gmail.com, bp@suse.de, colin.king@canonical.com, vbabka@suse.cz, tglx@linutronix.de, ricardo.neri-calderon@linux.intel.com, adam.buchbinder@gmail.com, thgarnie@google.com, corbet@lwn.net, luto@kernel.org, paul.gortmaker@windriver.com Reply-To: vbabka@suse.cz, colin.king@canonical.com, bp@suse.de, adam.buchbinder@gmail.com, ricardo.neri-calderon@linux.intel.com, tglx@linutronix.de, corbet@lwn.net, thgarnie@google.com, paul.gortmaker@windriver.com, luto@kernel.org, cmetcalf@mellanox.com, akpm@linux-foundation.org, mhiramat@kernel.org, dvyukov@google.com, mst@redhat.com, ravi.v.shankar@intel.com, brgerst@gmail.com, lstoakes@gmail.com, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, dave.hansen@linux.intel.com, peterz@infradead.org, adrian.hunter@intel.com, slaoub@gmail.com, qiaowei.ren@intel.com, keescook@chromium.org, ray.huang@amd.com, jslaby@suse.cz, acme@redhat.com, pbonzini@redhat.com, shuah@kernel.org In-Reply-To: <1509135945-13762-11-git-send-email-ricardo.neri-calderon@linux.intel.com> References: <1509135945-13762-11-git-send-email-ricardo.neri-calderon@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mpx] x86/insn-eval: Do not BUG on invalid register type Git-Commit-ID: ed594e4ba5bfe268d63d7cee3c1a827e3dd5056f 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: ed594e4ba5bfe268d63d7cee3c1a827e3dd5056f Gitweb: https://git.kernel.org/tip/ed594e4ba5bfe268d63d7cee3c1a827e3dd5056f Author: Ricardo Neri AuthorDate: Fri, 27 Oct 2017 13:25:37 -0700 Committer: Thomas Gleixner CommitDate: Wed, 1 Nov 2017 21:50:10 +0100 x86/insn-eval: Do not BUG on invalid register type We are not in a critical failure path. The invalid register type is caused when trying to decode invalid instruction bytes from a user-space program. Thus, simply print an error message. To prevent this warning from being abused from user space programs, use the rate-limited variant of pr_err(). along with a descriptive prefix. Signed-off-by: Ricardo Neri Signed-off-by: Thomas Gleixner Reviewed-by: Borislav Petkov Cc: "Michael S. Tsirkin" Cc: Peter Zijlstra Cc: Dave Hansen Cc: ricardo.neri@intel.com Cc: Adrian Hunter Cc: Paul Gortmaker Cc: Huang Rui Cc: Qiaowei Ren Cc: Shuah Khan Cc: Kees Cook Cc: Jonathan Corbet Cc: Jiri Slaby Cc: Dmitry Vyukov Cc: "Ravi V. Shankar" Cc: Chris Metcalf Cc: Brian Gerst Cc: Arnaldo Carvalho de Melo Cc: Andy Lutomirski Cc: Colin Ian King Cc: Chen Yucong Cc: Adam Buchbinder Cc: Vlastimil Babka Cc: Lorenzo Stoakes Cc: Masami Hiramatsu Cc: Paolo Bonzini Cc: Andrew Morton Cc: Thomas Garnier Link: https://lkml.kernel.org/r/1509135945-13762-11-git-send-email-ricardo.neri-calderon@linux.intel.com --- arch/x86/lib/insn-eval.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/lib/insn-eval.c b/arch/x86/lib/insn-eval.c index df9418c..4931d92 100644 --- a/arch/x86/lib/insn-eval.c +++ b/arch/x86/lib/insn-eval.c @@ -5,10 +5,14 @@ */ #include #include +#include #include #include #include +#undef pr_fmt +#define pr_fmt(fmt) "insn: " fmt + enum reg_type { REG_TYPE_RM = 0, REG_TYPE_INDEX, @@ -85,9 +89,8 @@ static int get_reg_offset(struct insn *insn, struct pt_regs *regs, break; default: - pr_err("invalid register type"); - BUG(); - break; + pr_err_ratelimited("invalid register type: %d\n", type); + return -EINVAL; } if (regno >= nr_registers) {