From patchwork Wed Oct 16 20:09:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 835835 Delivered-To: patch@linaro.org Received: by 2002:a5d:6804:0:b0:37d:45d0:187 with SMTP id w4csp618222wru; Wed, 16 Oct 2024 13:12:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVsILAe0FuCsr6B0AcE4oOyGIsiKg1dO7IOBMTczPCX+WhDq6YnqL71exPEhrjpx7hJCqex5w==@linaro.org X-Google-Smtp-Source: AGHT+IE0cTVQ09TXMTmBPlBDpSDu4u7k2XC78L7JrGuwBmJ0d9uohOHElradT11khpdEobQ6d4x0 X-Received: by 2002:a05:622a:1aa5:b0:458:4187:6eb8 with SMTP id d75a77b69052e-4608a5164bemr67397161cf.55.1729109532838; Wed, 16 Oct 2024 13:12:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729109532; cv=none; d=google.com; s=arc-20240605; b=K+cv0cJGRxClnCSfazOwVx8R81cNQBSC5bX9X6N7d3aF/ypRl4X8Q2snCgbA4/kdCl d7zJEfSH0jP6nCHEldg6S5xps6YPAV/fRxBHFPfh38AgmZupUCw4AjlR1UpbUXGNZ56B rx/x6iU3DyOOkhyKCPf9G3XoX/7r5sZ0ocXdwL2DNSFFTSZctqgaocmKJnc5rciJCqss BzEbRmdrctXlB7bBG64oZkbAyeMlgXJbd6cj2ibYInPYKDmkB3XFISxZ0TmlRua2x6mL qqibyhnJqA8ZKOrmuPk87bGJNMhtwcLP2Mb8R88w6eK37/Ay1FSQXQcyHCmaJpPT5FQ7 /LKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=q5cja5O9iin9sQVMLagX4qLP+vP2dshgTKBh5SH9ezo=; fh=UbSczJHoK8QyPNwfbKMWepRwzNWZsm+gkdUzUXKForo=; b=JOM0t+CLSt/h+7Ll+2YjdIAvUbDzSE3J5ZjbjYlUeWUojll8fca3Z43k+/N4vRd7H/ dbcGwjLNbnJEQqqj1V5/DT2iEvvJD6oLCN4d1HllWJVJaT+qVvc9pTT9JY7b8frk2f85 fefGM34ctAOFjUUemSkrvySW2mvEOuAsMreTXFjsjMb/17mPpR+rmmEjVYakvrCSNhhM /gucftXzfEvyvq3v6CNOGqiwwgsyUyjEE6Xg8J/8NMUYZYZ1CRV8ZWraqeSqFYg1dkQN JbKrB71/bsNFDMqBa3zaYQfkQardGyAisFatURJv9Gr87Gp0DcwSvsW2NGeebmGGSdfF yK0g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4607b4e5410si44116861cf.672.2024.10.16.13.12.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Oct 2024 13:12:12 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1ALy-0004ki-HO; Wed, 16 Oct 2024 16:10:42 -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 1t1ALx-0004kW-GI; Wed, 16 Oct 2024 16:10:41 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1ALv-0000ef-G7; Wed, 16 Oct 2024 16:10:41 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 5E28198F93; Wed, 16 Oct 2024 23:10:05 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 4376C156373; Wed, 16 Oct 2024 23:10:25 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Michael Tokarev Subject: [Stable-9.1.1 33/49] linux-user/flatload: Take mmap_lock in load_flt_binary() Date: Wed, 16 Oct 2024 23:09:52 +0300 Message-Id: <20241016201025.256294-1-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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: Philippe Mathieu-Daudé load_flt_binary() calls load_flat_file() -> page_set_flags(). page_set_flags() must be called with the mmap_lock held, otherwise it aborts: $ qemu-arm -L stm32/lib/ stm32/bin/busybox qemu-arm: ../accel/tcg/user-exec.c:505: page_set_flags: Assertion `have_mmap_lock()' failed. Aborted (core dumped) Fix by taking the lock in load_flt_binary(). Fixes: fbd3c4cff6 ("linux-user/arm: Mark the commpage executable") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2525 Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-ID: <20240822095045.72643-3-philmd@linaro.org> Signed-off-by: Richard Henderson (cherry picked from commit a9ee641bd46f5462eeed183ac3c3760bddfc2600) Signed-off-by: Michael Tokarev diff --git a/linux-user/flatload.c b/linux-user/flatload.c index 04d8138d12..0e4be5bf44 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -487,7 +487,10 @@ int load_flt_binary(struct linux_binprm *bprm, struct image_info *info) stack_len += (bprm->envc + 1) * 4; /* the envp array */ + mmap_lock(); res = load_flat_file(bprm, libinfo, 0, &stack_len); + mmap_unlock(); + if (is_error(res)) { return res; }