From patchwork Sat Nov 9 06:38:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 842064 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp2028558wru; Fri, 8 Nov 2024 22:40:21 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU+uoLq+j9lc3dJP+1b/NpHQRjzuP5eomyuGOvFatYcz/IJ4TwoQtZWUP8Eh+X5geZWXg93Og==@linaro.org X-Google-Smtp-Source: AGHT+IFO1N33dWPM+9qEbCXpHcf/nuz22qlmuta3t7Ke8pjhK/j07KvzONvvBpIISwQuJrzBbs7k X-Received: by 2002:a05:620a:1999:b0:7a9:be53:fe3b with SMTP id af79cd13be357-7b331de24ecmr782754785a.14.1731134421103; Fri, 08 Nov 2024 22:40:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731134421; cv=none; d=google.com; s=arc-20240605; b=P3NQwW8KMHFfrBLXomjC7kk9GAQr5KtGYAdK49kVAFm9Kz9m7VOQV6vtgBRd8pfzXw 6p6XsTvoWKG16xh4luJKTb3jpOaPCH97+VXdrDeZqgsTI06y8mLMlvaUrpspIHslaCpn 9VAiiAyBON/fiOM3hEjw9PNDnHsEXaq+B1TFTWUKArUgXqfTnoLStbDm3pF0w+obOSi9 qJAbx9aOWb1YmZcjL4tgOZl2lhNVk1hqHWNuZmGoUldDU+C6CX1hYjbj/OaGsILfxMIq etT4Q6dr66RUkrzmjuIY/5ab/188eA8Zt0QpMVzG0CYCffktZt41wnhYqWShhfWjAlJi 3iVg== 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=OSA/LUpQX0XgrjM3M+6BzZlQ+SLPocCQJI2bHxRO0zA=; fh=UbSczJHoK8QyPNwfbKMWepRwzNWZsm+gkdUzUXKForo=; b=IXkqowXKJo7qkA+L052v7ol8If5LKI0Mtp6LPyXSJLcsQrZ1vyyQTdVWWQL0022YTm rBLzJXnSDJ3IYRYL58XSqpjxaXMJUBLEPgyhZehjZXnCSsXnkXF85wDMtAVnyTCIS/EG vCFOCKCPlIhbGlx/cJ1VxU08958uLD8fwKWnAIRtZeNEndw+hK1/pSyZC0Jgby+Hmaq0 uAv2UVsFMieO5DkLWS1a7EJAYPGl5vjAreqaO3086ICOovjOFrmrY9GoWaCpx0n0oUg6 gLS6+9ntmudgGudAAKcYn5herapSePCCjRpWDxmV/5HZCqelPOCDLkrQ4O8jKl3n+IUY KA+w==; 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 af79cd13be357-7b32acba63bsi569865185a.302.2024.11.08.22.40.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Nov 2024 22:40:21 -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 1t9f8R-0003NC-T6; Sat, 09 Nov 2024 01:39:52 -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 1t9f87-00034A-Vr; Sat, 09 Nov 2024 01:39:32 -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 1t9f85-0001zF-Rs; Sat, 09 Nov 2024 01:39:31 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id BB164A12ED; Sat, 9 Nov 2024 09:38:09 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 3159F167DD1; Sat, 9 Nov 2024 09:39:04 +0300 (MSK) Received: (nullmailer pid 3272509 invoked by uid 1000); Sat, 09 Nov 2024 06:39:03 -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-7.2.15 06/33] linux-user/flatload: Take mmap_lock in load_flt_binary() Date: Sat, 9 Nov 2024 09:38:32 +0300 Message-Id: <20241109063903.3272404-6-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 e99570ca18..7f243500b3 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; }