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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE11EC43217 for ; Wed, 2 Nov 2022 11:06:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230322AbiKBLGW (ORCPT ); Wed, 2 Nov 2022 07:06:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230302AbiKBLGT (ORCPT ); Wed, 2 Nov 2022 07:06:19 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23B8024945 for ; Wed, 2 Nov 2022 04:06:19 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id e8-20020a5b0cc8000000b006bca0fa3ab6so15973019ybr.0 for ; Wed, 02 Nov 2022 04:06:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=GIr2ezHJZytLhlXMK2PvYo8WU5NrIng/zb7hVbc1Lzg=; b=TDR2QbrpbPk39MbEBp7QE2/LtaTl168eHDcSKXsTbYFm0J2N6gc1e1BbPZoiCjB8hU 9BaU4/mFK6rylWjr8RlezKIdwfyx6JEn4Xt+BuDRJzDqLGWxoSxMOuJisNk//4LKYqeo WmCgmQMbYt7wUV/ki7tYTWroZrWVcyodZ+cDyMos90rvZPUsmiKOw50wZWI3K4Yz2ekN hRPo9sFMvHxlZqZXXNZ4ZZ+etmzaSVqT7KWQmtgp0Yv1Qupyjg8fsdntbz4+2XCc848s GerrC3sXiYTqxNqrYQXvh3xr+wMLrxLHYxahoFSishfnQJ7qiPsqJNWKC1iXHXj2CqAF HCaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GIr2ezHJZytLhlXMK2PvYo8WU5NrIng/zb7hVbc1Lzg=; b=lvsNQwGNPpk0vQx28FEdeJZ+WldRaVfaRIdEWMnGtpN0eSLtS+YxQHMFXAbiT7AHUx /iE6XyKMYiQIWNwfK2vAz9Nscp16oyBSjG55erXSsLgNy9MVIGJcidLTrcK4UgiAJk8z 1CBGnT6h5VpvukmZcx2vquUyKNpWg/BkYiSz3n78B4SeDyQzHIdXzEhlEctxW7+YkahF NhAroIBAnr+uRMxoXdjLRvv1epZMM4VYUxTtedjUaxn/KKwOYbirRNU1aSn+R/C5y+5J 0ICnChvtZUz7qAS+wtQnd5LJEXF80RwZUzyFZh4a+FT0IGuVo63RYewVpzJa+BCwDzI7 m1ZA== X-Gm-Message-State: ACrzQf3a2ySV7Wt1Fn9e2DgB2m9jggyzneeLXSGRqYurl+2OBJj8qOcy X1vGHMnCj1OYCY5nShBKfb1a6+SUGxA= X-Google-Smtp-Source: AMsMyM46EzUNxA/tJ+HneP2x8faa5lSnGZX9YuhwEIjs8mzU+29Tq9Wklfbi16zLxPqq+zIolz1gsMz28xE= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:7f41:af20:8:a96d]) (user=glider job=sendgmr) by 2002:a81:a0d5:0:b0:370:1a06:1b4a with SMTP id x204-20020a81a0d5000000b003701a061b4amr178816ywg.206.1667387178012; Wed, 02 Nov 2022 04:06:18 -0700 (PDT) Date: Wed, 2 Nov 2022 12:06:08 +0100 In-Reply-To: <20221102110611.1085175-1-glider@google.com> Mime-Version: 1.0 References: <20221102110611.1085175-1-glider@google.com> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog Message-ID: <20221102110611.1085175-2-glider@google.com> Subject: [PATCH 2/5] x86/uaccess: instrument copy_from_user_nmi() From: Alexander Potapenko To: glider@google.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , Dave Hansen , Kees Cook , Peter Zijlstra , x86@kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make sure usercopy hooks from linux/instrumented.h are invoked for copy_from_user_nmi(). This fixes KMSAN false positives reported when dumping opcodes for a stack trace. Cc: Andrew Morton Cc: Dave Hansen Cc: Kees Cook Cc: Peter Zijlstra (Intel) Cc: x86@kernel.org Signed-off-by: Alexander Potapenko --- arch/x86/lib/usercopy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c index f1bb186171562..24b48af274173 100644 --- a/arch/x86/lib/usercopy.c +++ b/arch/x86/lib/usercopy.c @@ -6,6 +6,7 @@ #include #include +#include #include @@ -44,7 +45,9 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n) * called from other contexts. */ pagefault_disable(); + instrument_copy_from_user_before(to, from, n); ret = raw_copy_from_user(to, from, n); + instrument_copy_from_user_after(to, from, n, ret); pagefault_enable(); return ret; -- 2.38.1.273.g43a17bfeac-goog