From patchwork Fri Aug 4 22:00:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 710255 Delivered-To: patch@linaro.org Received: by 2002:a05:6359:d30:b0:129:c516:61db with SMTP id gp48csp229787rwb; Fri, 4 Aug 2023 15:03:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGdjyevZOZVH0NI9ho2M5w3VpPhDv6K+HIpnSADxagrvEde+1WNzTx0oZtCPvTanfJkD0oM X-Received: by 2002:a05:6830:1294:b0:6ba:a084:6a1b with SMTP id z20-20020a056830129400b006baa0846a1bmr2761494otp.10.1691186591435; Fri, 04 Aug 2023 15:03:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691186591; cv=none; d=google.com; s=arc-20160816; b=c/gjmmXSq5PWonleQY23RLmCzHuGwK8c97OaTzUTes9Y/5uQYWQcpxdKX0/OK7Tswv yXUNaqq/LMv5WBk9zDYTn/YE9SZd2bZhl/TwahdXlOej8e0VB+SR492eIC+QEu193vy3 QOB0bYst8aiGlZbFqgUzvVJdUsqs5Vqa7Kzv61s2olsG9W3rX0s2t0WUa3Hg9EJCHPtA OChWBQaAQyTeIhRTq+Xas3XTf0RTUiNnskrbWunZ6PxvmBZdhcWh0IXd3o3LalpgViGz 9b9+QSJ0AqxYLqpraCgfoFuLIajvD4QsgSJytZTEjKB8S0ogWA7fSA7tRvT0wpz7nmny 2rLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VNYrY2Waoll+LErzR9Xgbts1EKTxuONltL+p3Yeklu4=; fh=KbMqH8mq9CYjRSCjjAD/0kWfnvdKe1C4f7CRd7AraEQ=; b=T2JmRQVMXH1GWRvlrTRjfFvwHFa7S5ypZ9e4uaIpk5TNNQgWOkBfsopmMEc7M1JKj3 smi6l8WV06qPnXc6uxkK3d85urB8oP0DUUaPXgHLa/BgJXloKwqqR5H333xfV9fc8H0w z/fmEE/2qvMQaPShbqngoJAmrXERJOhbWhX/Hym/YRS4w41nRIcthRCwgyhGJSRCwgXV NAp8rfN1YaTNGwkvP1V69fEpPvveCjlfd4I21fn5f0AVfJFfBWLbrqFk52PbEW4mWiJy nTCE3i5tnLl55M2KfvwBkPNdGpanZ83Mr/CDkS5tepunIY+XlXDxSU7AvcsKk3N8nzN7 f03g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yo7WI6t5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y18-20020ac85f52000000b0040ff58d67dfsi1530313qta.599.2023.08.04.15.03.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Aug 2023 15:03:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yo7WI6t5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qS2rR-0005EO-1N; Fri, 04 Aug 2023 18:01:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qS2ql-0004aQ-0q for qemu-devel@nongnu.org; Fri, 04 Aug 2023 18:00:49 -0400 Received: from mail-oi1-x233.google.com ([2607:f8b0:4864:20::233]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qS2qh-0001oG-5l for qemu-devel@nongnu.org; Fri, 04 Aug 2023 18:00:45 -0400 Received: by mail-oi1-x233.google.com with SMTP id 5614622812f47-3a78604f47fso238663b6e.1 for ; Fri, 04 Aug 2023 15:00:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691186442; x=1691791242; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VNYrY2Waoll+LErzR9Xgbts1EKTxuONltL+p3Yeklu4=; b=Yo7WI6t5glkTUAPMQ0umLk/jb0jYnLaPxcNb7rv+2cjWe2usocQOl4ivHTgJpMmnEY IDXduaygAPwnbPBjyB8IY5zEAftxzsT+qOThmgHHikm+gFCcHn8NOHtPGmZjTtR3dLNW gNwZ/JAQm9Dqe/Xo/DhF6rMCEQFpNKex6MO5QBqLJ53uGYeScV1lyUdVgTR73OsL/R8K 3pYwG4bKnmKIsEiPevJT4iOXedqMHQIN1lIdl5OAleKiazrpj5mJp7iRm7UoBIFBCTQ7 JEQZy4ul7F+Ia/QeWFL84KPyvOyUChKIRGsramN0XL8Wwx8Asjo8gE3Df7QWxbYR++Py xPBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691186442; x=1691791242; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VNYrY2Waoll+LErzR9Xgbts1EKTxuONltL+p3Yeklu4=; b=KsRo9XCNSHQ+0upjHYdiCypQJPAgxWoQxaTIcGKGeewwTryPWAs43bQCQqCswKtvGz JJMUvCkV4YoRVmRcqiRHCh0kP9v7u5BI08KRszpF0IWsjdsupQDWbtBbFsxVlpgT//7m emU76i+gi6Q5Hqbe9jPULA1Po91xniPFdrXHNUG4vex3BXJO/GkiEmHk9p1x0dVXAOz9 utEkC9kknA80Rkr3cH3TOCbxG1qhSiiQVzIrWBh75eRoJhQ+8fvcY3gZ7rGonGWHgs3p EfTLVZxZXVtd70hPp+8S8cVuV5nwS5u/H7oKFZABmGyFM7341fRaK90Y8pfdWL9EZAVd yacQ== X-Gm-Message-State: AOJu0YyhIIUEu1IFq0Pv+3WNfDWYEOErw1QPcGGfp5SMjaB/inVOYjrx o5eP9OxqwnLCDbtlAYpEv5QHFBF/IWq5nAFyPY8= X-Received: by 2002:a54:468f:0:b0:3a7:4a89:752c with SMTP id k15-20020a54468f000000b003a74a89752cmr2992840oic.31.1691186441690; Fri, 04 Aug 2023 15:00:41 -0700 (PDT) Received: from stoup.. ([2602:47:d490:6901:1eed:f77f:f320:8b14]) by smtp.gmail.com with ESMTPSA id u1-20020a17090282c100b001bbf7fd354csm2185568plz.213.2023.08.04.15.00.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Aug 2023 15:00:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Akihiko Odaki , Helge Deller Subject: [PATCH v9 09/24] linux-user: Do nothing if too small brk is specified Date: Fri, 4 Aug 2023 15:00:17 -0700 Message-Id: <20230804220032.295411-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230804220032.295411-1-richard.henderson@linaro.org> References: <20230804220032.295411-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::233; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x233.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Akihiko Odaki Linux 6.4.7 does nothing when a value smaller than the initial brk is specified. Fixes: 86f04735ac ("linux-user: Fix brk() to release pages") Reviewed-by: Helge Deller Signed-off-by: Akihiko Odaki Message-Id: <20230802071754.14876-6-akihiko.odaki@daynix.com> Signed-off-by: Richard Henderson --- linux-user/syscall.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index f64024273f..e1436a3962 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -820,14 +820,14 @@ abi_long do_brk(abi_ulong brk_val) /* brk pointers are always untagged */ - /* return old brk value if brk_val unchanged or zero */ - if (!brk_val || brk_val == target_brk) { + /* return old brk value if brk_val unchanged */ + if (brk_val == target_brk) { return target_brk; } /* do not allow to shrink below initial brk value */ if (brk_val < initial_target_brk) { - brk_val = initial_target_brk; + return target_brk; } new_brk = TARGET_PAGE_ALIGN(brk_val);