From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8360FA372C for ; Fri, 8 Nov 2019 11:53:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 751F0207FA for ; Fri, 8 Nov 2019 11:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213986; bh=OlyRncxziSux4y0NWzxwnX71DQ/gmhItu0fkmbMkQtA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=foOrjecZLh61H8HOIqvG4J8xc26pWWzXksWQiQjWmn+JvT51NdcFVw75LPHgwX1RW o19bXI3xklULrPQDI9BRESTeYWV+Erb5owTHcyCklKrRsRfb4PSTm1IeGR0TA4gFws V1fXfJ+ayf6lPRBGt1BJDiJ45fm6Fw63/82E8vEw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390543AbfKHLq5 (ORCPT ); Fri, 8 Nov 2019 06:46:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:34492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391390AbfKHLqi (ORCPT ); Fri, 8 Nov 2019 06:46:38 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6192D222CE; Fri, 8 Nov 2019 11:46:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213598; bh=OlyRncxziSux4y0NWzxwnX71DQ/gmhItu0fkmbMkQtA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t198V+WddBEfU/8mowUfPq9TszKjhklWSAPf0NC/srCK+WwknyW5QTFwdDOyvIBhz M2jOJfyxkgcEdZMXgMShLIXCwSCK4uRGxLBg6k7IKTkueVJbj7d671VxjIjieF4Sdl Y+9JDno6ER3BiQAidbApdR/SpxlpP6y4elqOhTHE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Eric W. Biederman" , Thomas Gleixner , Sasha Levin Subject: [PATCH AUTOSEL 4.9 38/64] signal: Properly deliver SIGILL from uprobes Date: Fri, 8 Nov 2019 06:45:19 -0500 Message-Id: <20191108114545.15351-38-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108114545.15351-1-sashal@kernel.org> References: <20191108114545.15351-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Eric W. Biederman" [ Upstream commit 55a3235fc71bf34303e34a95eeee235b2d2a35dd ] For userspace to tell the difference between a random signal and an exception, the exception must include siginfo information. Using SEND_SIG_FORCED for SIGILL is thus wrong, and it will result in userspace seeing si_code == SI_USER (like a random signal) instead of si_code == SI_KERNEL or a more specific si_code as all exceptions deliver. Therefore replace force_sig_info(SIGILL, SEND_SIG_FORCE, current) with force_sig(SIG_ILL, current) which gets this right and is shorter and easier to type. Fixes: 014940bad8e4 ("uprobes/x86: Send SIGILL if arch_uprobe_post_xol() fails") Fixes: 0b5256c7f173 ("uprobes: Send SIGILL if handle_trampoline() fails") Reviewed-by: Thomas Gleixner Signed-off-by: "Eric W. Biederman" Signed-off-by: Sasha Levin --- kernel/events/uprobes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index fbfab5722254a..8ddd29476c0dc 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1846,7 +1846,7 @@ static void handle_trampoline(struct pt_regs *regs) sigill: uprobe_warn(current, "handle uretprobe, sending SIGILL."); - force_sig_info(SIGILL, SEND_SIG_FORCED, current); + force_sig(SIGILL, current); } @@ -1962,7 +1962,7 @@ static void handle_singlestep(struct uprobe_task *utask, struct pt_regs *regs) if (unlikely(err)) { uprobe_warn(current, "execute the probed insn, sending SIGILL."); - force_sig_info(SIGILL, SEND_SIG_FORCED, current); + force_sig(SIGILL, current); } } -- 2.20.1