From patchwork Wed Apr 12 17:24:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 82612 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp506170vqo; Wed, 12 Apr 2023 10:54:48 -0700 (PDT) X-Google-Smtp-Source: AKy350ajtwADy176Wmirhu/fPSPKJo2f9qEJ+qDBiDkhk3rSAWhuPnEe+7fSPd5TTbhCFUoeZ+pa X-Received: by 2002:a17:907:6e28:b0:94e:79c2:5e18 with SMTP id sd40-20020a1709076e2800b0094e79c25e18mr1908116ejc.38.1681322087845; Wed, 12 Apr 2023 10:54:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681322087; cv=none; d=google.com; s=arc-20160816; b=uni+iRJ+IXU9EkcaDVGI5cV1IuKmtgnZ9ORFy1/KeRI5IXagoO02kwYvrBItjJ6BLC oTIl7uI49Il5U8wq/ywR7EKOTOYgFbmD+sbmpCUwjd8yjS65QqGjZdJX/4o0hXQ/YUSQ AOPJxOkPN2RXZIG12zXKrhTypS/Wr7hoLI3X3ytpAZJ15d4FcnvcMsiRLKZOnZ6tWbMk CJWKGReg9Dx/7KFtR2IqI2KLTQ1PQrhXQMWjTzH2UgQZD/4PvdezHmrdl0bzCtuVevSr zkQex0HhMSSgzJYeBAbBjCVGt8yK8+8b38T6ip2oilNr8Si7YoN1iGlQPzeOe3pmIrNp jCXQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xZUn6yIelm7/HpU/gOGoZM0sTrX0C4pbQI9VlLTYDdo=; b=uDl7OUUucxio5U8rJ3gBTJJjp6ufH4Da9l3RmFUrnkeEgQsD/Xma3lj4LpsEA0IMwV ir6MI85jk3FoJhh8Rf87mzDDYbSu1JocRGdnunv84zozSXKabCDTsTJj8v+qwgG8D4Ps EkeS82mIEEujZ2+umBT85vKY/0I1qx9Krd4NTsGuB4SWz0qgYuTNHx/9gbHuVNRwQwJK ZH3+d0/HASDtgt9bOESAn4qTYa4L14MEh0Ed664G+n46Y/MBgekMEDEXpRq4uQS1B81K O9GN9POQMq0TnAV5VtRw+la/nyxfLimc4/BoC0ERr9tXr9jbQipMvF9xG6n0Pbbblkd4 LPCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sLf47uQl; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gs32-20020a1709072d2000b0094bd6195ccasi2042682ejc.531.2023.04.12.10.54.18; Wed, 12 Apr 2023 10:54:47 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=sLf47uQl; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231567AbjDLRYX (ORCPT + 99 others); Wed, 12 Apr 2023 13:24:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231363AbjDLRYR (ORCPT ); Wed, 12 Apr 2023 13:24:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56CC82729 for ; Wed, 12 Apr 2023 10:24:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E9718637C7 for ; Wed, 12 Apr 2023 17:24:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D88BC433AC; Wed, 12 Apr 2023 17:24:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681320255; bh=PX0fLdA8IAgbJJ5QVSIRQQaQAaqC5FcGk2sQ9w9igC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sLf47uQlDla37yzgOud/SwN71Lt30pJA4qAFFnzDAKXVX0/sUQWPIokzGctf7H+Nr HLxKShf6gkXywWFkR/i+LRfOe7kBTA6N04AajQUkt75OBc06A6K2qI6Nk3bP4mVdt/ aqtrJstMoGUvx9VoFw6l8mbtfnK52TydAaBs8x8Lf1uhwBIoGR9ZLDJCkbk+4QYivf N93ofL4lqufBXhrjjH6VDbQWEX1ZS3HPbVIEhtHBj+CD1qPEb7wz+Ty1i0kwyM39Hc 8wLHf9DbVMCSLTKrnO3SVZVWrHw4YmOxmTomZzQzTYvZP1c35ojwGEA6G3CxDLm5ng QltscOTPrno3A== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , frederic@kernel.org, paulmck@kernel.org, keescook@chromium.org Subject: [PATCH 3/3] lkdtm/stackleak: Fix noinstr violation Date: Wed, 12 Apr 2023 10:24:08 -0700 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1762993989490696456?= X-GMAIL-MSGID: =?utf-8?q?1762993989490696456?= Fixes the following warning: vmlinux.o: warning: objtool: check_stackleak_irqoff+0x2b6: call to _printk() leaves .noinstr.text section Signed-off-by: Josh Poimboeuf --- drivers/misc/lkdtm/stackleak.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/misc/lkdtm/stackleak.c b/drivers/misc/lkdtm/stackleak.c index 025b133297a6..f1d022160913 100644 --- a/drivers/misc/lkdtm/stackleak.c +++ b/drivers/misc/lkdtm/stackleak.c @@ -43,12 +43,14 @@ static void noinstr check_stackleak_irqoff(void) * STACK_END_MAGIC, and in either casee something is seriously wrong. */ if (current_sp < task_stack_low || current_sp >= task_stack_high) { + instrumentation_begin(); pr_err("FAIL: current_stack_pointer (0x%lx) outside of task stack bounds [0x%lx..0x%lx]\n", current_sp, task_stack_low, task_stack_high - 1); test_failed = true; goto out; } if (lowest_sp < task_stack_low || lowest_sp >= task_stack_high) { + instrumentation_begin(); pr_err("FAIL: current->lowest_stack (0x%lx) outside of task stack bounds [0x%lx..0x%lx]\n", lowest_sp, task_stack_low, task_stack_high - 1); test_failed = true; @@ -86,11 +88,14 @@ static void noinstr check_stackleak_irqoff(void) if (*(unsigned long *)poison_low == STACKLEAK_POISON) continue; + instrumentation_begin(); pr_err("FAIL: non-poison value %lu bytes below poison boundary: 0x%lx\n", poison_high - poison_low, *(unsigned long *)poison_low); test_failed = true; + goto out; } + instrumentation_begin(); pr_info("stackleak stack usage:\n" " high offset: %lu bytes\n" " current: %lu bytes\n" @@ -113,6 +118,7 @@ static void noinstr check_stackleak_irqoff(void) } else { pr_info("OK: the rest of the thread stack is properly erased\n"); } + instrumentation_end(); } static void lkdtm_STACKLEAK_ERASING(void)