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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 71975C432C3 for ; Tue, 19 Nov 2019 06:08:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F25A1206DA for ; Tue, 19 Nov 2019 06:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574143710; bh=3mxGYgjOUmLHh+Ma6tUAavgz5Jr5Y9Xm0paYCjzN3B8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QCBrQLUkbpLde4HHDwM5/BpaUdxwB/DPKPTq3ZKK8NhP3hC6GfmZ7M3dw2dvXlrQQ iRZ3bHdx/XJlKDlUvsNU0lOwihnjhyI4LuGgrLYBxal4xgLYi2h/TjKLhh8QO73Lpx WHiH7uXOPfSnFHt3JdyAcRAaNHASFWvyl5lBgcik= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727483AbfKSGI2 (ORCPT ); Tue, 19 Nov 2019 01:08:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:49676 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728318AbfKSFas (ORCPT ); Tue, 19 Nov 2019 00:30:48 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A2D6E21823; Tue, 19 Nov 2019 05:30:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141448; bh=3mxGYgjOUmLHh+Ma6tUAavgz5Jr5Y9Xm0paYCjzN3B8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sLIqpKT9s8CdSjrqg6UD+I/yTsWkZDVgJCW9sPytX7yL/wZZ9KZeRXOEJYnBBOfm+ w8lDpgeOeEyIDjxz4NTtZLL3OKzzYamXH/X/YSPL5YOXnAg33auBLVzYqN6vBN7C9t rw2htDaCf4EJXMd12s6cimaXFUjd+g7Vet+RTy48= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Gleixner , "Eric W. Biederman" , Sasha Levin Subject: [PATCH 4.19 164/422] signal: Properly deliver SIGSEGV from x86 uprobes Date: Tue, 19 Nov 2019 06:16:01 +0100 Message-Id: <20191119051409.089423391@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eric W. Biederman [ Upstream commit 4a63c1ffd384ebdce40aac9c997dab68379137be ] For userspace to tell the difference between an random signal and an exception, the exception must include siginfo information. Using SEND_SIG_FORCED for SIGSEGV 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(SIGSEGV, SEND_SIG_FORCE, current) with force_sig(SIG_SEGV, current) which gets this right and is shorter and easier to type. Fixes: 791eca10107f ("uretprobes/x86: Hijack return address") Reviewed-by: Thomas Gleixner Signed-off-by: "Eric W. Biederman" Signed-off-by: Sasha Levin --- arch/x86/kernel/uprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index 9119859ba7871..420aa7d3a2e6b 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c @@ -1089,7 +1089,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs pr_err("return address clobbered: pid=%d, %%sp=%#lx, %%ip=%#lx\n", current->pid, regs->sp, regs->ip); - force_sig_info(SIGSEGV, SEND_SIG_FORCED, current); + force_sig(SIGSEGV, current); } return -1; -- 2.20.1