From patchwork Sat Nov 9 10:14:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 842078 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp2082471wru; Sat, 9 Nov 2024 02:20:20 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXDqVzc751cp75vrqQPTnjz7j53Hmj1ClIwWkX8Am8MNwdah6ZeDQHsPvLGpUdJhz3zRhTWyQ==@linaro.org X-Google-Smtp-Source: AGHT+IEZaCC2GrP+J4A3xGzzJiJIMjLrxEMYcyFNnRV/oXfnn5bEoCsBGfGehlc9V0vLOcDMxACT X-Received: by 2002:a05:620a:280e:b0:7b1:45ac:86b4 with SMTP id af79cd13be357-7b331e8c6damr740777485a.21.1731147619980; Sat, 09 Nov 2024 02:20:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731147619; cv=none; d=google.com; s=arc-20240605; b=deeNfALDH4DxCRrHzFDJTgIj1itpyNHwkBY1gm8Rb1/GMEO43vRYxH1EpxfZdXtYKP RP8ggJxGILMTxz7pCSNDCLrvRMSIEyGeziHsEIw/Ss7+4o1OgMPrUYNm/7pb/4IhtcN2 a/2vmjBQVQN3lLDZZGY8X1eruFvh3DhTNjTKmUa3TuL18l8O0knnYAeM9XKbZS+A1iwg K0Y1kTdixAlnFb8ChzzbOU2CFHVqmPzKkhfQb1WZLduV+o8f3sPr+Jk6rxTfCoA0Qi4q 8eExYs89sfpmVm7oF2WBf1Gsqkx8FPeiyX0hwlPgWSgoQoEixToPU9MVj0Cxg1BD8w1s 6yzw== 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=Tj0LdkNcFcTqi+9KFZSsOBfGZSzNPuhz6yEGWqkx0yYD/knnEiCNuyzfcmkDvRwcPC IZnCL8hv//WJqvmlwRcm1A7oEbIU2jgGVh3tK6S9NdKLY6jcL3b7NA2DS00sZQtQB/6N PobyOjK7twbL3GnEvL+dVyeR1M4eDSae1f6jBgT3Dd6SyooFvS5y17PbgN8aT38z449K FyNBQx54Ke0YE4Zd62wyWgc++G+D2/31g99JIbKPitwbLCDWyboraUVXIA/ByzmJ13lK ThXBkMrZg1Q93hFN6UAf1Dyp0tWg3wOO60GxMfvmhKSXDdNSUuMFacAHf+mx0LBRL6N9 cvIw==; 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-7b32ac3d8bcsi611023785a.11.2024.11.09.02.20.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Nov 2024 02:20:19 -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 1t9iVa-0004un-3F; Sat, 09 Nov 2024 05:15:58 -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 1t9iUf-0003yV-GX; Sat, 09 Nov 2024 05:15:01 -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 1t9iUd-0007Xj-PG; Sat, 09 Nov 2024 05:15:01 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 8C7C8A13ED; Sat, 9 Nov 2024 13:13:49 +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 39F75167ED9; Sat, 9 Nov 2024 13:14:44 +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-8.2.8 09/49] linux-user/flatload: Take mmap_lock in load_flt_binary() Date: Sat, 9 Nov 2024 13:14:00 +0300 Message-Id: <20241109101443.312701-9-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; }