From patchwork Sun Jan 1 15:07:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 37951 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3801102wrt; Sun, 1 Jan 2023 07:09:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXuQMLUpHDK7p9ammCcGMD3Tx4qb2wqZHpVVONm4GKSf48DuQrnR50o3AJqy0lxH/5Yy7sCt X-Received: by 2002:a17:907:8312:b0:7fc:3fef:ab86 with SMTP id mq18-20020a170907831200b007fc3fefab86mr27778230ejc.71.1672585744983; Sun, 01 Jan 2023 07:09:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672585744; cv=none; d=google.com; s=arc-20160816; b=lOk44ovrvWwq94ChRaCjnT7Xe7N5hih1F31O9PA63+4G/QpecBLKuW4MepOlPrVirC JH646mHedYhKpCLdOySFDFu3mYKn5ZWqp/NDh878Hs0n1mSDIozz2ucOdpkSrxnXB9He hpPtqeRliOjjfYB1nI4231PfsEOG6spE9pki3CpDbHFLRFH/DvGetPLhTw0ERe+8MOBt o4jDN2Y/987b8+y2dCw77S7rwEljIiFpHImbtWFrn+DPLLH8mxjBeBn5QOQ+BO25JLEl 9w3ReGctAsnoKY9XQepKiqQpKsjcJdLNnR2XEKE0mn8gMHtKICI+Fa1DnbEfgv6PcOKs rWtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=zwqSK+qKJQo4Xxph7azln3No/eyO2tHuCZH+tvEnbQQ=; b=lJV5WprJZ9qeXBWJ8PXbViXTUrwrvKqJ1tL4w2Hhy4yKKeG17Z5i7hzVXrhErY0+5x yecvXHDsqXR2rlo3RLxLitDtBV4/YkXqFseFmKLCnzHWQ8H4pRT1vnRehKDhKczmA/SA ibrtUqIbpS6UkgqHMJYZGNkz+zPD04aRfS7zkcfrVgujHm1NAQ/iXanNRHtgIcEM6b7+ ZBywdyO2JPGiGzxldbddkHcHe2l3kMZPnY7M8tt9QChi1vUYiCe6+r6Frn77aUl/91lH oY3geUgnMfgf45Q22hlh6Nocr0wtzETtwLcci3hPlVUdXEm09poRazIa3kUEPKGkzNd2 nceg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=eUJRUmaN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ho30-20020a1709070e9e00b007be97d37b29si24563958ejc.104.2023.01.01.07.08.41; Sun, 01 Jan 2023 07:09:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=eUJRUmaN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230359AbjAAPHb (ORCPT + 99 others); Sun, 1 Jan 2023 10:07:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbjAAPH2 (ORCPT ); Sun, 1 Jan 2023 10:07:28 -0500 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86BDEC77 for ; Sun, 1 Jan 2023 07:07:27 -0800 (PST) Received: from zn.tnic (p5de8e9fe.dip0.t-ipconnect.de [93.232.233.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 2184A1EC0104; Sun, 1 Jan 2023 16:07:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1672585646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:in-reply-to:references; bh=zwqSK+qKJQo4Xxph7azln3No/eyO2tHuCZH+tvEnbQQ=; b=eUJRUmaNNGixVXpfQY6pel8LQvU33VW2+tZEHzH+QdvqcyRVzlnxKvbOspjcDNu3eJuwFm BKMirWq3awOq7MkBPfdxLR4ge6g8ORLCq+BJ6A9s01wr0zCUCMnHnH/1vnBtXAKM6lf8+s jtLmy8s2Z8rQGvyfJjcz5jrh6GNZsxk= Date: Sun, 1 Jan 2023 16:07:25 +0100 From: Borislav Petkov To: Linus Torvalds Cc: x86-ml , lkml Subject: [GIT PULL] x86/urgent for v6.2-rc2 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753833270410077852?= X-GMAIL-MSGID: =?utf-8?q?1753833270410077852?= Hi Linus, pls pull a couple of urgent x86 fixes for 6.2. Thx. --- The following changes since commit 1b929c02afd37871d5afb9d498426f83432e71c2: Linux 6.2-rc1 (2022-12-25 13:41:39 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/x86_urgent_for_v6.2_rc2 for you to fetch changes up to 63dc6325ff41ee9e570bde705ac34a39c5dbeb44: x86/kprobes: Fix optprobe optimization check with CONFIG_RETHUNK (2022-12-27 12:51:58 +0100) ---------------------------------------------------------------- - Two fixes to correct how kprobes handles INT3 now that they're added by other functionality like the rethunks and not only kgdb - Remove __init section markings of two functions which are referenced by a function in the .text section ---------------------------------------------------------------- Arnd Bergmann (1): x86/calldepth: Fix incorrect init section references Masami Hiramatsu (Google) (2): x86/kprobes: Fix kprobes instruction boudary check with CONFIG_RETHUNK x86/kprobes: Fix optprobe optimization check with CONFIG_RETHUNK arch/x86/kernel/callthunks.c | 4 ++-- arch/x86/kernel/kprobes/core.c | 10 +++++++--- arch/x86/kernel/kprobes/opt.c | 28 ++++++++-------------------- 3 files changed, 17 insertions(+), 25 deletions(-)