From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f74.google.com (mail-ot1-f74.google.com [209.85.210.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA2DD41B34F for ; Mon, 9 Feb 2026 19:06:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770663977; cv=none; b=SrYvvI7gywNt4xOWdUm7J0l7qc1az4TrB/iol1JhohcYQT8lJ+kw5SJjK3wI5HtF5K7DlkyMxHrKsesieb4hp9dfNpCkpxYDpq0bHXFsq4Q3iaKdN9aj+Bqaj/St/GlppeEwm+5sjrTV3GU+PkpbQ9pxbGXyVni4TY+qeWe8wbE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770663977; c=relaxed/simple; bh=NqG7bVpGByzbqLWbObaiJ3BzJR9rD0Wj+d/HvIRik1k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=eM5/tkhAqo38HxTQaxE6u6HMx8tmD2O+8kPAVCjDaFsiE4DojOKM/oBa3KrPOO0QDu0fEvAXx1QngatbdbtQvY4AYal3oNv3GzTthmBIZXPlw1y90yLweqKuUHv44TFAjq2KGnZC7h4G/qS3bDZvET1OCRd6xewjVc8RQ744C8s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--avagin.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=N22Dtfw/; arc=none smtp.client-ip=209.85.210.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--avagin.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="N22Dtfw/" Received: by mail-ot1-f74.google.com with SMTP id 46e09a7af769-7d42e248b0bso12932235a34.1 for ; Mon, 09 Feb 2026 11:06:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1770663976; x=1771268776; darn=lists.linux.dev; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=vdr4V4HK4nTpFzygAIFcY2is0P9+eeyi+VB04pSk0Ms=; b=N22Dtfw/1CesB+PR6L6VzupTFeomovv5dP4InfoEV6Xrh9Gj879DhCWSnkBKnriSqr QJvhpMqC9NAh18g4cPKDk5aFwLa2/IuEEsyQ9HjxeFIu8k4+He1ylewBSpAz03ppkHfx lGXDe4N/icIj9EwD6bNFrYV4HWn3R1p1lTpel2AMzAdfvonabdRhED+Qds0fPdBt6Rhi DhW4xf+6Um1KziqxGOGKlNeRaR7JKspa4tFYrV4jEPKGoH1LP4y16fbXaRjxX/k/VgLM 76UHCJQnQbG34pLbckkhs2OI93zY5DxrHrzq8Gbeb7uZwBsiPC0pKQXxhZYVnMoaeS/z JcyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770663976; x=1771268776; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=vdr4V4HK4nTpFzygAIFcY2is0P9+eeyi+VB04pSk0Ms=; b=kiyDKmbhcuj3bAWTYt0jG0XaW+nseHvfos8ZtYU6a1lQOYc8I9RNGpAIz4kPkSn2LK yieYXJlgPIICGZamkX3zzdpU1Ldxm71u4qeumAV4tEpdZSKCbe4JXu4rlY4JI1R67L91 i6l0Nvp5F0nFX1V687ZX1RB3S1yf07lKhmSVdISeeZzK32Sb6vJEOP42aLHlB5HwWgXU AzbnQNLOqo3EqLUmD/3qIzHCiVCgyPx3fbF1XyeaNEOJQ/MtZkxFgoDhwVjrmwUGl//A tyZNaVfIOSpu31yanROw+r2QkJmZuHHXTATGBS+yf1pUa2SaVHigasXysVAw8/KQau99 kjUQ== X-Forwarded-Encrypted: i=1; AJvYcCWmiGvpUhd3w8TsvKa7bC1KuA0AWfWL0k1VjRzMmNclnXjVGsiC6FMyMqb+OqaKnxmnSX0U@lists.linux.dev X-Gm-Message-State: AOJu0Yy6ArsfGY3y9gAqbpQP5CxCcij34udvTEeXkeRCmiiRS7+cqeen asGRwc+XVuswDUcMBiad4/b8DO5ZJ87EWy+JrCA5SGxRzCBqnwijvBQ9swmH7axqVrwS4+RMURB TRZK8ow== X-Received: from jajt22.prod.google.com ([2002:a05:6638:2056:b0:5ce:8aec:982c]) (user=avagin job=prod-delivery.src-stubby-dispatcher) by 2002:a4a:e54e:0:b0:66d:f051:e91f with SMTP id 006d021491bc7-66df0613260mr3273923eaf.23.1770663975878; Mon, 09 Feb 2026 11:06:15 -0800 (PST) Date: Mon, 9 Feb 2026 19:06:02 +0000 In-Reply-To: <20260209190605.1564597-1-avagin@google.com> Precedence: bulk X-Mailing-List: criu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260209190605.1564597-1-avagin@google.com> X-Mailer: git-send-email 2.53.0.239.g8d8fc8a987-goog Message-ID: <20260209190605.1564597-2-avagin@google.com> Subject: [PATCH 1/4] binfmt_elf_fdpic: fix AUXV size calculation for ELF_HWCAP3 and ELF_HWCAP4 From: Andrei Vagin To: Kees Cook , Andrew Morton Cc: Cyrill Gorcunov , Mike Rapoport , Alexander Mikhalitsyn , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, criu@lists.linux.dev, Chen Ridong , Christian Brauner , David Hildenbrand , Eric Biederman , Lorenzo Stoakes , Michal Koutny , Andrei Vagin , Mark Brown , Max Filippov Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Commit 4e6e8c2b757f ("binfmt_elf: Wire up AT_HWCAP3 at AT_HWCAP4") added support for AT_HWCAP3 and AT_HWCAP4, but it missed updating the AUX vector size calculation in create_elf_fdpic_tables() and AT_VECTOR_SIZE_BASE in include/linux/auxvec.h. Similar to the fix for AT_HWCAP2 in commit c6a09e342f8e ("binfmt_elf_fdpic: fix AUXV size calculation when ELF_HWCAP2 is defined"), this omission leads to a mismatch between the reserved space and the actual number of AUX entries, eventually triggering a kernel BUG_ON(csp !=3D sp). Fix this by incrementing nitems when ELF_HWCAP3 or ELF_HWCAP4 are defined and updating AT_VECTOR_SIZE_BASE. Cc: Mark Brown Cc: Max Filippov Reviewed-by: Michal Koutn=C3=BD Reviewed-by: Mark Brown Fixes: 4e6e8c2b757f ("binfmt_elf: Wire up AT_HWCAP3 at AT_HWCAP4") Signed-off-by: Andrei Vagin --- fs/binfmt_elf_fdpic.c | 6 ++++++ include/linux/auxvec.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 48fd2de3bca0..a3d4e6973b29 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -595,6 +595,12 @@ static int create_elf_fdpic_tables(struct linux_binprm= *bprm, #ifdef ELF_HWCAP2 nitems++; #endif +#ifdef ELF_HWCAP3 + nitems++; +#endif +#ifdef ELF_HWCAP4 + nitems++; +#endif =20 csp =3D sp; sp -=3D nitems * 2 * sizeof(unsigned long); diff --git a/include/linux/auxvec.h b/include/linux/auxvec.h index 407f7005e6d6..8bcb9b726262 100644 --- a/include/linux/auxvec.h +++ b/include/linux/auxvec.h @@ -4,6 +4,6 @@ =20 #include =20 -#define AT_VECTOR_SIZE_BASE 22 /* NEW_AUX_ENT entries in auxiliary table *= / +#define AT_VECTOR_SIZE_BASE 24 /* NEW_AUX_ENT entries in auxiliary table *= / /* number of "#define AT_.*" above, minus {AT_NULL, AT_IGNORE, AT_NOTELF= } */ #endif /* _LINUX_AUXVEC_H */ --=20 2.53.0.239.g8d8fc8a987-goog