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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 BBEC4C433E4 for ; Thu, 27 Aug 2020 15:09:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9D38122B40 for ; Thu, 27 Aug 2020 15:09:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="qqzFGQBK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728418AbgH0PJ2 (ORCPT ); Thu, 27 Aug 2020 11:09:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726093AbgH0PAr (ORCPT ); Thu, 27 Aug 2020 11:00:47 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE1A1C061235; Thu, 27 Aug 2020 08:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=dyzNrnbeRWDBy321zJA1JkTbM9HGH7MmVKIH+miEUVA=; b=qqzFGQBKp4rz3CojCaU6LVmeg/ wy22QbDo3yrLseAyIZRfKajDAvgWpAmCyobfFJ98XfvNlwTwpLPBBhvVMxCvExW6QZHxzGmEPlYfv BDzZbXRQ/Q/mUowEfX40dLVlBockSCtJAg0jj2ua1GnJLk/A07DsBvlboc1NBxzhuGDQMnDAb0LGL 2u3k0lxMJZcQjqcgc6JIDrCmU0l2UVWkSi6jXuaUiniQgqRmmyjseS8B9AeXw9DnJ/my/M/xjpuno WuwU1p7oNZkbAUz6/EsyiB4Zuu1stA+r0ytzDQyaJXNjmT7XHwL46DiKldYh9h/kRvHZSKjcPj9cg TmnHkMXg==; Received: from [2001:4bb8:18c:45ba:9892:9e86:5202:32f0] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kBJOJ-000451-0R; Thu, 27 Aug 2020 15:00:39 +0000 From: Christoph Hellwig To: Linus Torvalds , Al Viro , Michael Ellerman , x86@kernel.org Cc: Kees Cook , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 05/10] lkdtm: disable set_fs-based tests for !CONFIG_SET_FS Date: Thu, 27 Aug 2020 17:00:25 +0200 Message-Id: <20200827150030.282762-6-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200827150030.282762-1-hch@lst.de> References: <20200827150030.282762-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Once we can't manipulate the address limit, we also can't test what happens when the manipulation is abused. Signed-off-by: Christoph Hellwig --- drivers/misc/lkdtm/bugs.c | 4 ++++ drivers/misc/lkdtm/usercopy.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c index 4dfbfd51bdf774..0d5b93694a0183 100644 --- a/drivers/misc/lkdtm/bugs.c +++ b/drivers/misc/lkdtm/bugs.c @@ -315,11 +315,15 @@ void lkdtm_CORRUPT_LIST_DEL(void) /* Test if unbalanced set_fs(KERNEL_DS)/set_fs(USER_DS) check exists. */ void lkdtm_CORRUPT_USER_DS(void) { +#ifdef CONFIG_SET_FS pr_info("setting bad task size limit\n"); set_fs(KERNEL_DS); /* Make sure we do not keep running with a KERNEL_DS! */ force_sig(SIGKILL); +#else + pr_err("XFAIL: this requires set_fs()\n"); +#endif } /* Test that VMAP_STACK is actually allocating with a leading guard page */ diff --git a/drivers/misc/lkdtm/usercopy.c b/drivers/misc/lkdtm/usercopy.c index b833367a45d053..04d10063835241 100644 --- a/drivers/misc/lkdtm/usercopy.c +++ b/drivers/misc/lkdtm/usercopy.c @@ -327,6 +327,7 @@ void lkdtm_USERCOPY_KERNEL(void) void lkdtm_USERCOPY_KERNEL_DS(void) { +#ifdef CONFIG_SET_FS char __user *user_ptr = (char __user *)(0xFUL << (sizeof(unsigned long) * 8 - 4)); mm_segment_t old_fs = get_fs(); @@ -338,6 +339,9 @@ void lkdtm_USERCOPY_KERNEL_DS(void) if (copy_to_user(user_ptr, buf, sizeof(buf)) == 0) pr_err("copy_to_user() to noncanonical address succeeded!?\n"); set_fs(old_fs); +#else + pr_err("XFAIL: this requires set_fs()\n"); +#endif } void __init lkdtm_usercopy_init(void) -- 2.28.0