Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2639196pxj; Mon, 14 Jun 2021 03:44:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKhs3d/xum9Q6cXXowP2Aysk4zXG1Bxt1sqNkih7JaPcKfOT67G1g3tDTSlJPapED4dpPX X-Received: by 2002:a50:8fc3:: with SMTP id y61mr15712138edy.107.1623667497612; Mon, 14 Jun 2021 03:44:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623667497; cv=none; d=google.com; s=arc-20160816; b=0EC7QnsuKQDGGhYwY84qq9XJV32GMkaNXxzQV/oSWagB5SVJ6dYEdGzPDUB9wBdoKe G116fJIogbbcRdoSE7X9R+PZkZS8XKXYGKI2Jb3bTz+KlIdIsuWnywWiTi68HmbsCuOJ jevz1kzIZIWidDq5XuN28tUuPzVnTCRPRqiVWSoWBKGaswCUuInSykkwVaKSstQOiVCN TkwYfEyVmccDC+PPHb6PWfrjkaoHKJz2D2CJWFfQq50ekQWsNrbv8fU735BiI9bEMVaq MB7wNmCF0qIBKpOBSpDP3m3L3r4+PSf27VfW3ejOTPLGxJGEKGdCfrrxrwOHq+E3/OeD G1sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EL/CgSLypPi3MJkhhi+LOagVBwdSWZLiXocWhnZpR00=; b=SAGhFwUIHxvZmx55qtqWipxB2WH4kw6WxeLZYDrSQXk+hKJq7ncpzyAHK6ezB6qsCp CE34aP+5RyYQOrs4FsM+sODe8o4S70rJnv4mb6iIaB8U7ATd3hG4Xj8JIfBG2hNbEiOo NOsGlvBq9dsAZZ5BjmUb4GbaShKPeFraH6tr7f8inOMgi1FA2xB9QAdrk+e9bUMYIu3f mYVHmOezR/YJgfz0iVnGgkPaKczA9cEr1ZdOLc+wqZ0NMwv4E7pEhKADIdMnENIu+Se+ apZkJRvrO8Z9MDUKVS4cm7SZZHF2dIRW+OvR2cGoK4HhmrU90Opg5MAs+c/Ugv0o7+jn rG/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hy6eVeXE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bt12si11834732ejb.669.2021.06.14.03.44.24; Mon, 14 Jun 2021 03:44:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hy6eVeXE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232864AbhFNKpb (ORCPT + 99 others); Mon, 14 Jun 2021 06:45:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:45950 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233251AbhFNKiU (ORCPT ); Mon, 14 Jun 2021 06:38:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3C62E6140F; Mon, 14 Jun 2021 10:33:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623666840; bh=GQlo89kE2EBytn31tyStiEvWsQdnn8xSzyokyeE6gOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hy6eVeXEfybQuJtkLrr7qg++E8YOMI3VbfmKqRt9J39g32b9+t3mPC+Tgp4p6LJ6P z4oIQWJy/th/SG1Ybf6YTHB55R87q1jpFyqeFFk38r3PvvDXKir0oV3CXKQ+isRjyh h5XHaCRehTOzbSPX0HWnrGKsEqAZ8Ev6SHDMAOKM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark-PK Tsai , "Steven Rostedt (VMware)" Subject: [PATCH 4.14 48/49] ftrace: Do not blindly read the ip address in ftrace_bug() Date: Mon, 14 Jun 2021 12:27:41 +0200 Message-Id: <20210614102643.424483634@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210614102641.857724541@linuxfoundation.org> References: <20210614102641.857724541@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steven Rostedt (VMware) commit 6c14133d2d3f768e0a35128faac8aa6ed4815051 upstream. It was reported that a bug on arm64 caused a bad ip address to be used for updating into a nop in ftrace_init(), but the error path (rightfully) returned -EINVAL and not -EFAULT, as the bug caused more than one error to occur. But because -EINVAL was returned, the ftrace_bug() tried to report what was at the location of the ip address, and read it directly. This caused the machine to panic, as the ip was not pointing to a valid memory address. Instead, read the ip address with copy_from_kernel_nofault() to safely access the memory, and if it faults, report that the address faulted, otherwise report what was in that location. Link: https://lore.kernel.org/lkml/20210607032329.28671-1-mark-pk.tsai@mediatek.com/ Cc: stable@vger.kernel.org Fixes: 05736a427f7e1 ("ftrace: warn on failure to disable mcount callers") Reported-by: Mark-PK Tsai Tested-by: Mark-PK Tsai Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/ftrace.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2042,12 +2042,18 @@ static int ftrace_hash_ipmodify_update(s static void print_ip_ins(const char *fmt, const unsigned char *p) { + char ins[MCOUNT_INSN_SIZE]; int i; + if (probe_kernel_read(ins, p, MCOUNT_INSN_SIZE)) { + printk(KERN_CONT "%s[FAULT] %px\n", fmt, p); + return; + } + printk(KERN_CONT "%s", fmt); for (i = 0; i < MCOUNT_INSN_SIZE; i++) - printk(KERN_CONT "%s%02x", i ? ":" : "", p[i]); + printk(KERN_CONT "%s%02x", i ? ":" : "", ins[i]); } enum ftrace_bug_type ftrace_bug_type;