From patchwork Tue Jul 16 22:43:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1961348 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=BXDPnnhW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WNvHp6lyNz20B2 for ; Wed, 17 Jul 2024 08:43:50 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2164B387088B for ; Tue, 16 Jul 2024 22:43:49 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-yw1-x1131.google.com (mail-yw1-x1131.google.com [IPv6:2607:f8b0:4864:20::1131]) by sourceware.org (Postfix) with ESMTPS id 1CE5A385DDE6 for ; Tue, 16 Jul 2024 22:43:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1CE5A385DDE6 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1CE5A385DDE6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721169808; cv=none; b=VBxx+Sna5/iwMX2zPk3mam0GTGihqCvz1MyXv95CX67d7lcuKktO3Dx+JII+S59cZan9eaC/Fv8L/JFUHkcpXy9hH63Uwk4D6v6laRH7CHyVTt13QeiatGkiiGFiDvKv/NDqMleLaZnl+ht93IeIG+v2NAsM4TNGlAPK5Gi8pmI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721169808; c=relaxed/simple; bh=FGsZyrC++GHHxKHnA/EZcn4P7e8859PQJyzH+zw55tw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=KkW1tYTL/E7GWo2r++Z4CdcvXP6BhOm42osxoZojkELbWIiZKafacanfUBsYjjbMFzGt3WgQQBHGuntGPs39wjJadswXcPWdwpFb58gA3BFmFKtA6aHY4HzxpXn2Kj82+wx7P5DD6+unTrCrjx/Z0AV+eyz5ZRBHB471IRrL8+I= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yw1-x1131.google.com with SMTP id 00721157ae682-64f4fd64773so69140717b3.0 for ; Tue, 16 Jul 2024 15:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721169806; x=1721774606; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=myFexGVoy2AKAL4T5oYuZanqraOKmWr1sfloBVgJ7Z0=; b=BXDPnnhWIwDT9Bmot9Cl4pY67TkD3n+msr5Js52OXYBxkO8iOtVbIwAJPAlePF1gEB gbwvFWsNJRu1WSTh/pvcsYsdPSYxK7jpTZEfyatt2bzpXpFBT+WptYHnCV+KRifLeiEy k6hJ5MbhRxNZooApBN7JeNOmk/3WRxY8mQxM9PedPQo9SGEXxkGIezdoHws1uGVd3N1a 7xpkrLA44Du12YPzPslM3X4AYebecwvzjZsP6g62xd+JmgrmsY45iMSMiaK4e7DFr2Z/ F56FGzJvhear67SpX7rHKqakVOpCcLKwDauEnBPCpX1SIb3dof9s16b4Sp7sAHxocpln N52g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721169806; x=1721774606; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=myFexGVoy2AKAL4T5oYuZanqraOKmWr1sfloBVgJ7Z0=; b=i6i33Vxeyc0hfIuNaqyYl1rgsx1jUVNd4bJAo/cAS+mpousxYPjDMCsqKzDZPZ9gPC Y6QwcyHcmjrRsMBPz92D8Bjlizp8NJDLLMvMYfailrPmOiCSmI/Im/2kXBVLTWS14Syt QyIOnb71bvXKGUojygXsvzAygGRBTKMbZ5+q7nmfpp05jDKtSh+oouqmBayYW/Q5jy9u AGhymQAla4w4hDSXLEj0E6Cr9ZFiVQ/ZgjzrCnt6Y+EkgGCFs+CAAFYlhlvtVzlZiQib kvs61zpna1oUm1E0WqjLGQB398OkqnldrW2uA4IZFXtykV4ZMkfVDbAkQd+yrXHtcO/4 hIaQ== X-Gm-Message-State: AOJu0YzsPEsPh3YNgK3eAt2BuR1EOq2HBub9m0dGmIpK9safYhqZ5H6l PIgx9ViykPHK90yRM+b1gNp30o+OdPISJi/JcORU6gxeb+uaMVuxnEFns30wMk58aQ== X-Google-Smtp-Source: AGHT+IHUXSdM1Y4sD9AeYxFED3IFTQbDh/Jutct97a7AEgKw1hq/9MzYhpGIaSFXE4dyxJKKjndaqQ== X-Received: by 2002:a05:690c:61c2:b0:664:6532:bd46 with SMTP id 00721157ae682-664fe25eee3mr70407b3.19.1721169806234; Tue, 16 Jul 2024 15:43:26 -0700 (PDT) Received: from gnu-tgl-3.localdomain ([172.58.139.74]) by smtp.gmail.com with ESMTPSA id 00721157ae682-65fc212bbeasm13265997b3.2.2024.07.16.15.43.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 15:43:25 -0700 (PDT) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id AC8FAC01AA for ; Tue, 16 Jul 2024 15:43:21 -0700 (PDT) From: "H.J. Lu" To: libc-alpha@sourceware.org Subject: [PATCH v2 1/3] linux: Update the mremap C implementation [BZ #31968] Date: Tue, 16 Jul 2024 15:43:19 -0700 Message-ID: <20240716224321.2352246-2-hjl.tools@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240716224321.2352246-1-hjl.tools@gmail.com> References: <20240716224321.2352246-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3020.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org Update the mremap C implementation to support the optional argument for MREMAP_DONTUNMAP added in Linux 5.7 since it may not always be correct to implement a variadic function as a non-variadic function on all Linux targets. Return MAP_FAILED and set errno to EINVAL for unknown flag bits. This fixes BZ #31968. Note: A test must be added when a new flag bit is introduced. Signed-off-by: H.J. Lu --- sysdeps/unix/sysv/linux/mremap.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/mremap.c b/sysdeps/unix/sysv/linux/mremap.c index 4f770799c4..1ada5c1f40 100644 --- a/sysdeps/unix/sysv/linux/mremap.c +++ b/sysdeps/unix/sysv/linux/mremap.c @@ -20,6 +20,12 @@ #include #include #include +#include + +#define MREMAP_KNOWN_BITS \ + (MREMAP_MAYMOVE \ + | MREMAP_FIXED \ + | MREMAP_DONTUNMAP) void * __mremap (void *addr, size_t old_len, size_t new_len, int flags, ...) @@ -27,7 +33,13 @@ __mremap (void *addr, size_t old_len, size_t new_len, int flags, ...) va_list va; void *new_addr = NULL; - if (flags & MREMAP_FIXED) + if (flags & ~(MREMAP_KNOWN_BITS)) + { + __set_errno (EINVAL); + return MAP_FAILED; + } + + if (flags & (MREMAP_FIXED | MREMAP_DONTUNMAP)) { va_start (va, flags); new_addr = va_arg (va, void *);