From nobody Sun May 19 11:06:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1696366980; cv=none; d=zohomail.com; s=zohoarc; b=jqtOYB7WXC7aCXMQgmW/thmXhSOI0jpw3Gxkk9n+YoDK5NIF8Prd2V/2Hkm5+r/K/AdLyaNg05tlhniZ7AE4eoefDRRf9SwKRkop1mW3c7ZJwVrDYL624QMrlwmBciNYPHmfyufE11Ngw6dwkYLYgcPLQlBDduR4T5mTz1iBdAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696366980; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=N938UrnFkOT2gy6JyFgGyO/OoKqKi29Ln0bJArnR3w0=; b=NdGpaaz1Nj7wjB9+xbzuAQizJrbEHzvMJitGeHeEwKlpM43a20S8+fsdFF57naPOrZaSB0DjXoXYUu3oA1/pb+wkt+3jvjZpo+ai+TvrdbI7DDXy76O6RT4qVT/1yXQ0XIsVyDqWIXKdWgFccSMiH3EW6eRq1dd4TMPZ3EF2cqE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696366980039911.8632693393464; Tue, 3 Oct 2023 14:03:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnmXI-0002gI-DQ; Tue, 03 Oct 2023 17:02:32 -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 1qnmXC-0002fo-3b for qemu-devel@nongnu.org; Tue, 03 Oct 2023 17:02:29 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qnmX9-0007xG-EQ for qemu-devel@nongnu.org; Tue, 03 Oct 2023 17:02:25 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1c0ecb9a075so10686815ad.2 for ; Tue, 03 Oct 2023 14:02:22 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id cu24-20020a17090afa9800b00274b9dd8519sm17493pjb.35.2023.10.03.14.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 14:02:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696366941; x=1696971741; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=N938UrnFkOT2gy6JyFgGyO/OoKqKi29Ln0bJArnR3w0=; b=uviH3D9MbNGPHL/5GUamj9Fjxptkm70l+s5xqnc5JSuP2Q942pD+0d4t1tWlOj+CYc JgENfPYs4FhThnB/wjfe/W6D170NDf19u7eiXuEP2MwsM4GXILYVwICJa9voaD0faQJV BGjUr934/DdW4xe+RnVFlD9P8k9G7eM8u+nv8Ks5EVLWrUl2QkWlxJ19RpgHogWAZo1w CHbRi81oAokzJGVBLrrWxu07AmwL9oO+6+u7QhLE7GBlwsi9xI82MxsgzqJ9Ydb7vmGz 1FgWzg9EyC1wj0ojbq3Va95s5pXakZqB9X57jYKGnRAb5K4UOr7Zt1C5fFl6Lw3a2Bm2 APlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696366941; x=1696971741; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=N938UrnFkOT2gy6JyFgGyO/OoKqKi29Ln0bJArnR3w0=; b=T+tG6+BsGQetwgQiM2eatkw69R6lqnWeUxlfph+ud1aW7mVMZDIuge2m3Qt2+ceFMh kJGasoiXLU6B7fX1+EvYibSxG2h77HUM9NJuPqnaF7fBhah9YkIZtSbYN8C0tBjhL4YL RqLllSGOnNxDROikccgCRGSCEbAvzfKeSejDJPsoJmLLDb1hkb39UNfVii5vaL/rD+97 FO3R51L+0tGzlZsy+O4pdG/ujas/2yxO239t7tchAc/rcqDx9m0Vg3r4bR+Az8HiTuWi DIGcp4WKHvYEWlGwXVr+TrMrNnweSeDWXm0HEU4WuaWJEviTwmm6D02f0n0tMcvR1RGk 3vfQ== X-Gm-Message-State: AOJu0YwFsjsaOLmcxleceYnVoeDi5hZUsr+GCnIg0JpvBYE8lQew4nBT 061+VLiJQGdVIlVF4OpkAcT6SYcH1so0PxEyQ0w= X-Google-Smtp-Source: AGHT+IFVq7r6ntIlB2H9qvqBMiwBB2zX0P9ztERmwDdA/35jlnsKI8KyIQHyq3ceSCYp/kcxejMEjg== X-Received: by 2002:a17:90b:1a8c:b0:273:ed61:a682 with SMTP id ng12-20020a17090b1a8c00b00273ed61a682mr521487pjb.1.1696366941555; Tue, 03 Oct 2023 14:02:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu, Andreas Schwab Subject: [PATCH] linux-user: Propagate failure in mmap_reserve_or_unmap back to target_munmap Date: Tue, 3 Oct 2023 14:02:20 -0700 Message-Id: <20231003210220.1713908-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1696366980497100001 Content-Type: text/plain; charset="utf-8" Do not assert success, but return any failure received. Additionally, fix the method of earlier error return in target_munmap. Reported-by: Andreas Schwab Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/mmap.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 8eaf57b208..2d8b7842d1 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -778,7 +778,7 @@ fail: return -1; } =20 -static void mmap_reserve_or_unmap(abi_ulong start, abi_ulong len) +static int mmap_reserve_or_unmap(abi_ulong start, abi_ulong len) { abi_ulong real_start; abi_ulong real_last; @@ -807,7 +807,7 @@ static void mmap_reserve_or_unmap(abi_ulong start, abi_= ulong len) prot |=3D page_get_flags(a + 1); } if (prot !=3D 0) { - return; + return 0; } } else { for (prot =3D 0, a =3D real_start; a < start; a +=3D TARGET_PAGE_S= IZE) { @@ -825,7 +825,7 @@ static void mmap_reserve_or_unmap(abi_ulong start, abi_= ulong len) } =20 if (real_last < real_start) { - return; + return 0; } } =20 @@ -836,32 +836,36 @@ static void mmap_reserve_or_unmap(abi_ulong start, ab= i_ulong len) void *ptr =3D mmap(host_start, real_len, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE, -1, 0); - assert(ptr =3D=3D host_start); - } else { - int ret =3D munmap(host_start, real_len); - assert(ret =3D=3D 0); + return ptr =3D=3D host_start ? 0 : -1; } + return munmap(host_start, real_len); } =20 int target_munmap(abi_ulong start, abi_ulong len) { + int ret; + trace_target_munmap(start, len); =20 if (start & ~TARGET_PAGE_MASK) { - return -TARGET_EINVAL; + errno =3D EINVAL; + return -1; } len =3D TARGET_PAGE_ALIGN(len); if (len =3D=3D 0 || !guest_range_valid_untagged(start, len)) { - return -TARGET_EINVAL; + errno =3D EINVAL; + return -1; } =20 mmap_lock(); - mmap_reserve_or_unmap(start, len); - page_set_flags(start, start + len - 1, 0); - shm_region_rm_complete(start, start + len - 1); + ret =3D mmap_reserve_or_unmap(start, len); + if (likely(ret =3D=3D 0)) { + page_set_flags(start, start + len - 1, 0); + shm_region_rm_complete(start, start + len - 1); + } mmap_unlock(); =20 - return 0; + return ret; } =20 abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, --=20 2.34.1