Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp4782565iob; Mon, 9 May 2022 01:14:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzY+RgV/PmVGWQwKFO2YgRjd6bNSvzdpscL+9L0zhZEh72YR1q65ar8iffXBHS+4WJ4oRZn X-Received: by 2002:a63:ff0b:0:b0:3c6:b0b:dfee with SMTP id k11-20020a63ff0b000000b003c60b0bdfeemr12691466pgi.346.1652084059096; Mon, 09 May 2022 01:14:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652084059; cv=none; d=google.com; s=arc-20160816; b=frl/Z1+GJagtDYdBnMoNJlYcBpDXebc3+y8V6ouh/gfjsQZK/DLzJ4K8FymbhdJQSI 9qn69z6uhZs8b/HSq9QBKQ/9jifLJytxWIMdj/qKrXJC+WastjnX/S8lXHhnqONhggD6 UwE0EDWVSbGp5jqo4Jdn79MK5m5rh6kOwfkAyP+wfzygVGr25gC4/m8h6iv2yqYQgPLn /H4QzgbHhIIT/D8ikHC9M96GUU9qvW77t262U5Q99qOBfwUqOJqHXo9V7d1FQOEDRAwH cXOF8kQ7lcQyS8kPdgE0e5JAYbmbo8t7i+LhYju70jkX62r8Dy2vsvX+K6AUeAXJxNm9 Uofg== 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=ruxetFzsQbioLb+RaVCafV/4sa8rYtKzVgmQtds8Gdg=; b=zakcy0U23R2l3bLkmeOVY+gDT7JqRfBOpqWNbFkOE5+3LB9KkhBzzpATjVGWeEWeui Ad4sC26ZkTzJitpS98gEE/UfQN35fgrhdYQaQNwq0PPhe5ybhy8JjHPVgso/QPm+XBXu AGLi+qQfxOyImX43UBMuCF9OPC7DneprBQdq/hCdVKnZ6QiI3FCCbrHlhCIB+OYMfedc 3V3xl/FWiWLXmwRSjBAGWqucppEHhls8fG0UTw6tppY+cDkleivS3Psqml/aqoSrWr1d tOxlZ2+hjxl1eIa0/PhoPFvrsb6Ad9nR/SxlwcRtk2RbjhfrwPsYrb96Og2dJreUXOwi NcKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0GLthIeR; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id k15-20020a170902c40f00b0015a91674899si15231150plk.279.2022.05.09.01.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 01:14:19 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0GLthIeR; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2E24018F259; Mon, 9 May 2022 01:02:40 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376595AbiEDRyt (ORCPT + 99 others); Wed, 4 May 2022 13:54:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357427AbiEDRPC (ORCPT ); Wed, 4 May 2022 13:15:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DEFB54BEB; Wed, 4 May 2022 09:58:34 -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 3EE66618D7; Wed, 4 May 2022 16:58:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 891A0C385A5; Wed, 4 May 2022 16:58:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683513; bh=o3fwiYNUByskOnAIx26ubpASTmCmxwMLzU8e5rSfD0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0GLthIeRKnJgZ4A6r9ZGw1ZJyMkyl3JmVCJE8w6IOVl+RKhM+KxHkVcJIVeG0FKJ4 Q+oXg+/Z1+ptlXmfVIS333NNyoVy16CGr0PRhQHAOmxtqtzR8wPcNweJBVE8CSXyiH pqlHEE8kYt9kiK7Dk/s0WIo3lT5ebio/h3LdqW7g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sidhartha Kumar , Shuah Khan , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 5.17 176/225] selftest/vm: verify remap destination address in mremap_test Date: Wed, 4 May 2022 18:46:54 +0200 Message-Id: <20220504153126.000337458@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 From: Sidhartha Kumar [ Upstream commit 18d609daa546c919fd36b62a7b510c18de4b4af8 ] Because mremap does not have a MAP_FIXED_NOREPLACE flag, it can destroy existing mappings. This causes a segfault when regions such as text are remapped and the permissions are changed. Verify the requested mremap destination address does not overlap any existing mappings by using mmap's MAP_FIXED_NOREPLACE flag. Keep incrementing the destination address until a valid mapping is found or fail the current test once the max address is reached. Link: https://lkml.kernel.org/r/20220420215721.4868-2-sidhartha.kumar@oracle.com Signed-off-by: Sidhartha Kumar Reviewed-by: Shuah Khan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- tools/testing/selftests/vm/mremap_test.c | 42 ++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/vm/mremap_test.c b/tools/testing/selftests/vm/mremap_test.c index 9a518fee6306..58775dab3cc6 100644 --- a/tools/testing/selftests/vm/mremap_test.c +++ b/tools/testing/selftests/vm/mremap_test.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "../kselftest.h" @@ -64,6 +65,30 @@ enum { .expect_failure = should_fail \ } +/* + * Returns false if the requested remap region overlaps with an + * existing mapping (e.g text, stack) else returns true. + */ +static bool is_remap_region_valid(void *addr, unsigned long long size) +{ + void *remap_addr = NULL; + bool ret = true; + + /* Use MAP_FIXED_NOREPLACE flag to ensure region is not mapped */ + remap_addr = mmap(addr, size, PROT_READ | PROT_WRITE, + MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, + -1, 0); + + if (remap_addr == MAP_FAILED) { + if (errno == EEXIST) + ret = false; + } else { + munmap(remap_addr, size); + } + + return ret; +} + /* Returns mmap_min_addr sysctl tunable from procfs */ static unsigned long long get_mmap_min_addr(void) { @@ -111,8 +136,8 @@ static void *get_source_mapping(struct config c) goto retry; src_addr = mmap((void *) addr, c.region_size, PROT_READ | PROT_WRITE, - MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, - -1, 0); + MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, + -1, 0); if (src_addr == MAP_FAILED) { if (errno == EPERM || errno == EEXIST) goto retry; @@ -179,9 +204,20 @@ static long long remap_region(struct config c, unsigned int threshold_mb, if (!((unsigned long long) addr & c.dest_alignment)) addr = (void *) ((unsigned long long) addr | c.dest_alignment); + /* Don't destroy existing mappings unless expected to overlap */ + while (!is_remap_region_valid(addr, c.region_size) && !c.overlapping) { + /* Check for unsigned overflow */ + if (addr + c.dest_alignment < addr) { + ksft_print_msg("Couldn't find a valid region to remap to\n"); + ret = -1; + goto out; + } + addr += c.dest_alignment; + } + clock_gettime(CLOCK_MONOTONIC, &t_start); dest_addr = mremap(src_addr, c.region_size, c.region_size, - MREMAP_MAYMOVE|MREMAP_FIXED, (char *) addr); + MREMAP_MAYMOVE|MREMAP_FIXED, (char *) addr); clock_gettime(CLOCK_MONOTONIC, &t_end); if (dest_addr == MAP_FAILED) { -- 2.35.1