From patchwork Sat Nov 9 12:07:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 842089 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp2114798wru; Sat, 9 Nov 2024 04:12:36 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU7+PBgft8nT5f3q3+y4MFiYwKxxw0sappqdThFtfEkHlaK/d4YuMNFvSEIgT8cgkzxTJYbFg==@linaro.org X-Google-Smtp-Source: AGHT+IGV1I0UwmZ6Bj1XraPINfSUGAOketET1lwJ7OByEc3qQ/Q1iLLgWObxJJ/d1bxYZGlHuXGQ X-Received: by 2002:a05:6214:5248:b0:6d1:7383:9ca4 with SMTP id 6a1803df08f44-6d39e1e1a4fmr85420936d6.33.1731154355923; Sat, 09 Nov 2024 04:12:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731154355; cv=none; d=google.com; s=arc-20240605; b=HEG+2s7/YTxkLi2WFFqeH8fy9yoBf5qVh3m1zLFduOzEDqXJKrNEFyKhrd5xRG8DV3 aUKoRbmdHrdlxWarppT2/GrIMr4FQMTVubRol9gBWCtOfLPvCOOZRvJXWqFvJ7Q1iCtX WaqP5zIXSMvH8OCatbll8r+nCIG4lLBIPp+GkU4rcLLzuCyMVYQHULhup+1fhDV3Cfof h5agh/b/KZ9RLnJIcVY2DL1cm+Dv53yKT6LBYKRstFY1DO9+CXIh9YdvZ3qDSi8FfcmM st6/O8WUfdmmiOBnLJ6VA6B64UJgmcbVLPZlC/BUTZHi0bdWFBO4k5d91GPwJj3nNuO6 oh/Q== 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=Ocp+TixImrU72kxgC0b1Tth+I5Kt2wP9tQrn/W4nGW8=; fh=UbSczJHoK8QyPNwfbKMWepRwzNWZsm+gkdUzUXKForo=; b=Bb3gA9oO842kfnw1iTrx9hnBNUCOdqlfwVBlG9PFTtxRFsGuwSwMISsDMFqeQicg8j Yq4bHQMpee/WmsdjMwLZpkEKAA1t18/JjK8YcxVoT+JMcUut0EasGypBJz002I+25X2a tQ3aDS7P7SCVCPjtGGvLDIjL3J6IweIPp5VeLOVNGcUY2tppaIl3yR3y1hERTbOZguIZ yCrEBNgHejdo+Clrzc7NsfJZUUBeJ3qhK1ImgNi1hqTnV6VqS5pDLFMp1hkS8/7/DSEb 75jFFaCmqxBibgGIvF9x1lh2bfEDUYXdxhuKKKYw4LtJ8YGRJ+PZlqYrhFBWHWjwcZB6 gBLQ==; 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 6a1803df08f44-6d3962100b3si65129656d6.25.2024.11.09.04.12.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Nov 2024 04:12:35 -0800 (PST) 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 1t9kGo-0000Je-MY; Sat, 09 Nov 2024 07:08:50 -0500 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 1t9kGm-0000B8-Hr; Sat, 09 Nov 2024 07:08:48 -0500 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 1t9kGk-0003mx-SC; Sat, 09 Nov 2024 07:08:48 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 4D3C0A15F3; Sat, 9 Nov 2024 15:07:07 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 14BB1167F81; Sat, 9 Nov 2024 15:08:02 +0300 (MSK) Received: (nullmailer pid 3295283 invoked by uid 1000); Sat, 09 Nov 2024 12:08:01 -0000 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.0.4 11/57] linux-user/flatload: Take mmap_lock in load_flt_binary() Date: Sat, 9 Nov 2024 15:07:13 +0300 Message-Id: <20241109120801.3295120-11-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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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 5b62aa0a2b..6278655574 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -747,7 +747,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; }