From nobody Fri Apr 3 04:45:49 2026 Received: from mail-oo1-f73.google.com (mail-oo1-f73.google.com [209.85.161.73]) (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 E00DE2673A5 for ; Tue, 17 Feb 2026 18:01:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771351275; cv=none; b=OmhOMx3Je0OdFvIr137waRaRXpNE3oaKr56C3EB7Zdbz37PT/Kv2ZTLvcr55pLiwti7Dady35h3QA14YzENWZ9aM36DfSIPHX6OcXwR8/l/OjO95dMHitZtb5/p6eNQD5BHH1vmhdf5y+WpSqRYEArJLrf6vLJrc6DY/txCV/bI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771351275; c=relaxed/simple; bh=zFws/lBJDBflGBbsfpNrklciHMFXvn4h47ireyoBTMQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ca+dM4D+jbOs/KbM/7ST2quY8hQsstAVWB1GGk0yw0vO5lQbIGQNoL5/ukZZPJzSLjiCA4DCGnm/Rsmcn3pqsbNjxup/9T0bPMRbdtnvNASs2xamGXYNYuR0MDFIh7XNLqyGn9nqktLU+5cWM4I4Fps0pR95yhdx2GJZoZbR3HY= 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=iLkPW5K1; arc=none smtp.client-ip=209.85.161.73 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="iLkPW5K1" Received: by mail-oo1-f73.google.com with SMTP id 006d021491bc7-67999892f00so17374597eaf.3 for ; Tue, 17 Feb 2026 10:01:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771351273; x=1771956073; darn=vger.kernel.org; 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=BWILvLkFP9VgHvdYSVEMstLcXKjVhz4il8XVeiAhgTI=; b=iLkPW5K1gzfkDTbJOg3LX8aR1U9jZEQZKGboeMuSlQh5dMFPaa5d7dCnhNkuX7OOxu RHpflpgF2Quz9OciM39qu8WIP13mPll2ByYdfqs79L6z/zKp47nxusBf7WvM9wuGfhLV Zv/s9wMETQzpYxxTi0VLq5IJyZx3pG4PZ2DzGxxPOo7s92mKTgp/jdC4oFWFlXW0422e vzaAHuA8bNP8okpwY95DQFdC16map2SVRoIMD+P4V/iSiuMFCOVPireKLWAdYMoRQ/3T lPCWhQyEItys8/gDX29Qitk3EJS4z83suSIaAI5XB/Gnutb1JRBLDDiaU8tGpdHISgbw CARw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771351273; x=1771956073; 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=BWILvLkFP9VgHvdYSVEMstLcXKjVhz4il8XVeiAhgTI=; b=B3MeHMll5/TT7ZyZl7Ei6sfbFE5hBMU+SA+scp/6XBkIwrZDI0ieUKEwn0K5XsU0FG Qn5q5hhTBxfgcD05wXqw3kqkeU9jUpVtSGi7RT8yzKBvI1ahbK3Vnv0PSujy06tPGq+0 KyokvUiWBC9TT+HDpIWXCKxs9JH69ZSr1gyLWwwgB/MhjVwNXI1+rMQmKaF7SfCpx8EG 4yLz7lRYwYZZs27u/R1ANQtnNjgUVMtgdt5e5fQhPQnxulD8gvAFBX8ZOPvrr1nRfsPW u/GyjOxFAAvrKHUXu/5NrbeUgXR4I14jZ9IDHywyxiLNERV+U8/Eq0Oxpo9qtMtZTsDx N3RQ== X-Forwarded-Encrypted: i=1; AJvYcCXGskz9xpogSG8LTYcn7/APrmZ8XPuBN1yo6O5I4wVEGGhZfd38IhON92yNIGVGnEKe8N2+BvVbPLDeR6c=@vger.kernel.org X-Gm-Message-State: AOJu0YzUmVPt+P/0IA0TCYx0RJwK7fGRYEGOCzxm6R0YD3nNcfFjqCp4 i0yfPj+A8jPKzLj5vnG6ihNVj5cW/FQwBh7K9JIdnwI6tiX7HBSX8UpeAVHc75VKFQfUj8IQQm2 g17ixWA== X-Received: from jabko7.prod.google.com ([2002:a05:6638:8f07:b0:5ca:4c19:c2b7]) (user=avagin job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6820:458d:b0:663:364:674f with SMTP id 006d021491bc7-67858fea6bfmr4750317eaf.1.1771351272644; Tue, 17 Feb 2026 10:01:12 -0800 (PST) Date: Tue, 17 Feb 2026 18:01:05 +0000 In-Reply-To: <20260217180108.1420024-1-avagin@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260217180108.1420024-1-avagin@google.com> X-Mailer: git-send-email 2.53.0.310.g728cabbaf7-goog Message-ID: <20260217180108.1420024-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 , Alexander Mikhalitsyn Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Cyrill Gorcunov Reviewed-by: Alexander Mikhalitsyn 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.310.g728cabbaf7-goog From nobody Fri Apr 3 04:45:49 2026 Received: from mail-oo1-f74.google.com (mail-oo1-f74.google.com [209.85.161.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 458682BD01B for ; Tue, 17 Feb 2026 18:01:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771351276; cv=none; b=sEsekfUg9KOjiO1UhqplfZZGLHWkEqYZrfDWt+Ktnh/asPKRGu6uH0SMZ/P3vuzV0TjBwbuYXxuwGSAU04TBDLqHHz4oq/gX+6JYrm3f9F/BRX9FNjo6ugQEkHfPbY6AZ+SEe5kJE88c0289Y+o93/4Zb1THprEqfUXoUIiRzHY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771351276; c=relaxed/simple; bh=IMo7fTZiH5AjbqIlP1FpJeao4rQ8mb0ZRSl0gCTzrco=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Li0W1dr5MW642BEOEYYnWrILodR7MqAm7CTpXDNqkksaXiAqlMhA9XtBPKTcWjkK1PBRGPVawLlpJX54AmyLhUUS1zrqs3YyOgTJuSvLZS+DDd9SovJTBOZNUGtPkeKSL8dTIVOuHFEw9vQKWvpdYD3RPp0cbP3umxPt+Evrmvo= 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=cBScIjuJ; arc=none smtp.client-ip=209.85.161.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="cBScIjuJ" Received: by mail-oo1-f74.google.com with SMTP id 006d021491bc7-678f3fef828so45048488eaf.1 for ; Tue, 17 Feb 2026 10:01:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771351274; x=1771956074; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=zNf1st2FT2PYXwVv7YSArpm+3hAEziPMQnbmcsUNwA8=; b=cBScIjuJbSK0MAIIJ0IkAAfG4mzSLTMKibqW8EV8CDg2m4WqplDlgQMpIenXC2u5PK 8TsQgBGHMjfXZKjPxTWsfAgU9gxpRefyMbU3uoN7PENBINz9RZsuoSLJMa9I8IgfvFrR 1lE6h/i4Is4BVMNbL5R3vkQGNo5uYeMQTzY6pwtIUubtYQLBTBnSHI4QNUdaBQqEKf19 rieZJqV+tdH+j6u1tGedpSIu6w0KgbbZWfIOMDuYbyEK9WX/J+9aqJ5NuoF3hKQxVEgw IR6Ingz6krSB54x2F+FoxTe85Df9Bjs162g8KpnIEoHCl7MK1RyL+pPbrM7lCfOoRGBB QtoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771351274; x=1771956074; h=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=zNf1st2FT2PYXwVv7YSArpm+3hAEziPMQnbmcsUNwA8=; b=t62iXTZz7CTfQXRCwebaPyApgqEM8aK6eb0lcTV0DGB+mGN+YGBcuxgI2rqy/TYnqL rvCcBcs33fITwumtszVfGUKMp+VfI/T/hzUwfFtj+DBnfvwrC1Pln968qXM0XTkg09ce iWTnAclkb0VnPLS5YUHPuQmLka0vcxeIEkQ3kYcmywlmrFli6h8q/odzuS8h9pP/acYb o/x2nA7cAuAVp9D4GNEq3cc4Ld37l4hrbdzVqRiS83KkGj0vOEz0qothzVN1pdXkglLA wnbmjAVX+UX7YWwO7xQCDuqnOCbWC9nV+i9wrls6iPm2SRaqY5HyoXcjfm6uxOOwPKX1 vriQ== X-Forwarded-Encrypted: i=1; AJvYcCW+hagoXPfPYjNEceS1IoamS+hWJvI2WhzDTYYybn+g/o1+HvKY5QhbojJalOs4HoyJvePJP76qqZ05AYU=@vger.kernel.org X-Gm-Message-State: AOJu0YwyrsQrp3WFQhF0kzTS4EmfIEtx3cV0zNtJ+jz11S/qh++0o4dx b5i6xd1MggvvDlDO8lvWZ4Gv5iJzuwd55OJfybEEGBy8Benckz0HAqQ89pT0CdcGrVrnDObQZB0 ki2IC9Q== X-Received: from jabx17.prod.google.com ([2002:a02:6f11:0:b0:5cf:13a7:b8e8]) (user=avagin job=prod-delivery.src-stubby-dispatcher) by 2002:a4a:e719:0:b0:678:cf78:1e9a with SMTP id 006d021491bc7-678cf7820e5mr4561614eaf.35.1771351274078; Tue, 17 Feb 2026 10:01:14 -0800 (PST) Date: Tue, 17 Feb 2026 18:01:06 +0000 In-Reply-To: <20260217180108.1420024-1-avagin@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260217180108.1420024-1-avagin@google.com> X-Mailer: git-send-email 2.53.0.310.g728cabbaf7-goog Message-ID: <20260217180108.1420024-3-avagin@google.com> Subject: [PATCH 2/4] exec: inherit HWCAPs from the parent process 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 , Alexander Mikhalitsyn Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduces a mechanism to inherit hardware capabilities (AT_HWCAP, AT_HWCAP2, etc.) from a parent process when they have been modified via prctl. To support C/R operations (snapshots, live migration) in heterogeneous clusters, we must ensure that processes utilize CPU features available on all potential target nodes. To solve this, we need to advertise a common feature set across the cluster. This patch adds a new mm flag MMF_USER_HWCAP, which is set when the auxiliary vector is modified via prctl(PR_SET_MM, PR_SET_MM_AUXV). When execve() is called, if the current process has MMF_USER_HWCAP set, the HWCAP values are extracted from the current auxiliary vector and stored in the linux_binprm structure. These values are then used to populate the auxiliary vector of the new process, effectively inheriting the hardware capabilities. The inherited HWCAPs are masked with the hardware capabilities supported by the current kernel to ensure that we don't report more features than actually supported. This is important to avoid unexpected behavior, especially for processes with additional privileges. Reviewed-by: Cyrill Gorcunov Reviewed-by: Alexander Mikhalitsyn Signed-off-by: Andrei Vagin --- fs/binfmt_elf.c | 8 ++--- fs/binfmt_elf_fdpic.c | 8 ++--- fs/exec.c | 63 ++++++++++++++++++++++++++++++++++++++++ include/linux/binfmts.h | 11 +++++++ include/linux/mm_types.h | 2 ++ kernel/fork.c | 3 ++ kernel/sys.c | 5 +++- 7 files changed, 91 insertions(+), 9 deletions(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 3eb734c192e9..aec129e33f0b 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -246,7 +246,7 @@ create_elf_tables(struct linux_binprm *bprm, const stru= ct elfhdr *exec, */ ARCH_DLINFO; #endif - NEW_AUX_ENT(AT_HWCAP, ELF_HWCAP); + NEW_AUX_ENT(AT_HWCAP, bprm->hwcap); NEW_AUX_ENT(AT_PAGESZ, ELF_EXEC_PAGESIZE); NEW_AUX_ENT(AT_CLKTCK, CLOCKS_PER_SEC); NEW_AUX_ENT(AT_PHDR, phdr_addr); @@ -264,13 +264,13 @@ create_elf_tables(struct linux_binprm *bprm, const st= ruct elfhdr *exec, NEW_AUX_ENT(AT_SECURE, bprm->secureexec); NEW_AUX_ENT(AT_RANDOM, (elf_addr_t)(unsigned long)u_rand_bytes); #ifdef ELF_HWCAP2 - NEW_AUX_ENT(AT_HWCAP2, ELF_HWCAP2); + NEW_AUX_ENT(AT_HWCAP2, bprm->hwcap2); #endif #ifdef ELF_HWCAP3 - NEW_AUX_ENT(AT_HWCAP3, ELF_HWCAP3); + NEW_AUX_ENT(AT_HWCAP3, bprm->hwcap3); #endif #ifdef ELF_HWCAP4 - NEW_AUX_ENT(AT_HWCAP4, ELF_HWCAP4); + NEW_AUX_ENT(AT_HWCAP4, bprm->hwcap4); #endif NEW_AUX_ENT(AT_EXECFN, bprm->exec); if (k_platform) { diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index a3d4e6973b29..55b482f03c82 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -629,15 +629,15 @@ static int create_elf_fdpic_tables(struct linux_binpr= m *bprm, */ ARCH_DLINFO; #endif - NEW_AUX_ENT(AT_HWCAP, ELF_HWCAP); + NEW_AUX_ENT(AT_HWCAP, bprm->hwcap); #ifdef ELF_HWCAP2 - NEW_AUX_ENT(AT_HWCAP2, ELF_HWCAP2); + NEW_AUX_ENT(AT_HWCAP2, bprm->hwcap2); #endif #ifdef ELF_HWCAP3 - NEW_AUX_ENT(AT_HWCAP3, ELF_HWCAP3); + NEW_AUX_ENT(AT_HWCAP3, bprm->hwcap3); #endif #ifdef ELF_HWCAP4 - NEW_AUX_ENT(AT_HWCAP4, ELF_HWCAP4); + NEW_AUX_ENT(AT_HWCAP4, bprm->hwcap4); #endif NEW_AUX_ENT(AT_PAGESZ, PAGE_SIZE); NEW_AUX_ENT(AT_CLKTCK, CLOCKS_PER_SEC); diff --git a/fs/exec.c b/fs/exec.c index 2e3a6593c6fd..9c70776fca9e 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1454,6 +1454,17 @@ static struct linux_binprm *alloc_bprm(int fd, struc= t filename *filename, int fl */ bprm->is_check =3D !!(flags & AT_EXECVE_CHECK); =20 + bprm->hwcap =3D ELF_HWCAP; +#ifdef ELF_HWCAP2 + bprm->hwcap2 =3D ELF_HWCAP2; +#endif +#ifdef ELF_HWCAP3 + bprm->hwcap3 =3D ELF_HWCAP3; +#endif +#ifdef ELF_HWCAP4 + bprm->hwcap4 =3D ELF_HWCAP4; +#endif + retval =3D bprm_mm_init(bprm); if (!retval) return bprm; @@ -1775,6 +1786,55 @@ static int bprm_execve(struct linux_binprm *bprm) return retval; } =20 +static void inherit_hwcap(struct linux_binprm *bprm) +{ + struct mm_struct *mm =3D current->mm; + int i, n; + +#ifdef ELF_HWCAP4 + n =3D 4; +#elif defined(ELF_HWCAP3) + n =3D 3; +#elif defined(ELF_HWCAP2) + n =3D 2; +#else + n =3D 1; +#endif + + for (i =3D 0; n && i < AT_VECTOR_SIZE; i +=3D 2) { + unsigned long type =3D mm->saved_auxv[i]; + unsigned long val =3D mm->saved_auxv[i + 1]; + + switch (type) { + case AT_NULL: + goto done; + case AT_HWCAP: + bprm->hwcap =3D val & ELF_HWCAP; + break; +#ifdef ELF_HWCAP2 + case AT_HWCAP2: + bprm->hwcap2 =3D val & ELF_HWCAP2; + break; +#endif +#ifdef ELF_HWCAP3 + case AT_HWCAP3: + bprm->hwcap3 =3D val & ELF_HWCAP3; + break; +#endif +#ifdef ELF_HWCAP4 + case AT_HWCAP4: + bprm->hwcap4 =3D val & ELF_HWCAP4; + break; +#endif + default: + continue; + } + n--; + } +done: + mm_flags_set(MMF_USER_HWCAP, bprm->mm); +} + static int do_execveat_common(int fd, struct filename *filename, struct user_arg_ptr argv, struct user_arg_ptr envp, @@ -1843,6 +1903,9 @@ static int do_execveat_common(int fd, struct filename= *filename, current->comm, bprm->filename); } =20 + if (mm_flags_test(MMF_USER_HWCAP, current->mm)) + inherit_hwcap(bprm); + return bprm_execve(bprm); } =20 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index 65abd5ab8836..94a3dcf9b1d2 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -2,6 +2,7 @@ #ifndef _LINUX_BINFMTS_H #define _LINUX_BINFMTS_H =20 +#include #include #include #include @@ -67,6 +68,16 @@ struct linux_binprm { unsigned long exec; =20 struct rlimit rlim_stack; /* Saved RLIMIT_STACK used during exec. */ + unsigned long hwcap; +#ifdef ELF_HWCAP2 + unsigned long hwcap2; +#endif +#ifdef ELF_HWCAP3 + unsigned long hwcap3; +#endif +#ifdef ELF_HWCAP4 + unsigned long hwcap4; +#endif =20 char buf[BINPRM_BUF_SIZE]; } __randomize_layout; diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 8731606d8d36..2f3c6ad48c0a 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -1918,6 +1918,8 @@ enum { #define MMF_TOPDOWN 31 /* mm searches top down by default */ #define MMF_TOPDOWN_MASK BIT(MMF_TOPDOWN) =20 +#define MMF_USER_HWCAP 32 /* user-defined HWCAPs */ + #define MMF_INIT_LEGACY_MASK (MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK |\ MMF_DISABLE_THP_MASK | MMF_HAS_MDWE_MASK |\ MMF_VM_MERGE_ANY_MASK | MMF_TOPDOWN_MASK) diff --git a/kernel/fork.c b/kernel/fork.c index e832da9d15a4..4c92a2bc3cbb 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1104,6 +1104,9 @@ static struct mm_struct *mm_init(struct mm_struct *mm= , struct task_struct *p, =20 __mm_flags_overwrite_word(mm, mmf_init_legacy_flags(flags)); mm->def_flags =3D current->mm->def_flags & VM_INIT_DEF_MASK; + + if (mm_flags_test(MMF_USER_HWCAP, current->mm)) + mm_flags_set(MMF_USER_HWCAP, mm); } else { __mm_flags_overwrite_word(mm, default_dump_filter); mm->def_flags =3D 0; diff --git a/kernel/sys.c b/kernel/sys.c index cdbf8513caf6..e4b0fa2f6845 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2157,8 +2157,10 @@ static int prctl_set_mm_map(int opt, const void __us= er *addr, unsigned long data * not introduce additional locks here making the kernel * more complex. */ - if (prctl_map.auxv_size) + if (prctl_map.auxv_size) { memcpy(mm->saved_auxv, user_auxv, sizeof(user_auxv)); + mm_flags_set(MMF_USER_HWCAP, mm); + } =20 mmap_read_unlock(mm); return 0; @@ -2190,6 +2192,7 @@ static int prctl_set_auxv(struct mm_struct *mm, unsig= ned long addr, =20 task_lock(current); memcpy(mm->saved_auxv, user_auxv, len); + mm_flags_set(MMF_USER_HWCAP, mm); task_unlock(current); =20 return 0; --=20 2.53.0.310.g728cabbaf7-goog From nobody Fri Apr 3 04:45:49 2026 Received: from mail-oo1-f73.google.com (mail-oo1-f73.google.com [209.85.161.73]) (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 BC41D37105D for ; Tue, 17 Feb 2026 18:01:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771351278; cv=none; b=XgATeN3AMB3ZU00q2A+3XSfGUDfpuv+kLal9bNdaFZ60noWsTrdICo5dn6CVdvPLeYjlLWXB53Ablv6T6sTCGKBkpVhmJ2ivWpMVjjV2tD5fFukSX6192tPtFMAeMIL9/c4paiMvg/IF9ymxt/L85RiHpf16TBcWTH+9kL66OVI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771351278; c=relaxed/simple; bh=3Hi4Yw1wa5t6RwBOUReTRUch3U2jt68qYKe1b8CJ15E=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EXR0yqgtKC+Max5T/gXOvoAql7FLqT4D0qgYJe5S1BBlCC1JfuhieFv69pIrusxYyv34I7XbszU7x2eCqrTS0qNiSZnlG7dqYrNJ6sVRqo9RAq8LV/f3vfwpS2bwOBVnoyJancd/GU9xzpYchs5CO92V5kByHwPex7cZ8TkvEMg= 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=G/RRn3WG; arc=none smtp.client-ip=209.85.161.73 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="G/RRn3WG" Received: by mail-oo1-f73.google.com with SMTP id 006d021491bc7-679943693c0so23505172eaf.3 for ; Tue, 17 Feb 2026 10:01:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771351276; x=1771956076; darn=vger.kernel.org; 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=sNWH6w2foYf8QmhTrAmxhB/CQUCC0ZNVw0ETpO4TRL8=; b=G/RRn3WGXChfjYl416ZnkaHqChV1tM+Q/kJknc/q27uWFs+Oc1lYwp9i3wpYU6PChl vDTLO+2TijMCnpoCXI6t8rufTpfhamTeHdIxDvJAAeeo84d1mbgGe4N4UsagYHbuTMN8 tzkNc8nkNAZV+0auIr8CvNF2JtC7xdw3X05PjGPflu6huYKXCb1mmFkEPTIdXePFkjUJ eOD/62ZRuL2FGttlqodSjtGvEMGvXPl5yfA6L+HTZwmioqLNtbva11Ice/gehxwpHrD4 wFayBbS3GUC/VS6klopHSvX9dHEjwXC7JZxTXh8IV8xbhyW5OgEqnxNL0xQXeIq4xw19 5w2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771351276; x=1771956076; 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=sNWH6w2foYf8QmhTrAmxhB/CQUCC0ZNVw0ETpO4TRL8=; b=bQFih8FhySsFLHWEGSe57qdwMe+ubLyY0kOhKYzVRgY8KLMddPwJ1muwW77NLBFnD+ ziVA4uk/4JtNIMFnB4z72yVh1MMyTcMouFeHL4R1YlLYtJYx0RdZTtCuZq67kdkm5FkI iOMYLbbDWDYFiDPghgCX1wNEz8utbZYCN3y0FMDOT/tx9LPdGrBccbGdFnwmFt1hT9wb lKe6qkXc8IkODeiSEbCC4knzd1bup3om1gnp6XY1+t3Y5nseUBeTgDvb82UoBNsSG9lE xHYPoiV4uQZ5eX2mbUG02oIrTtRrUMLT2EkmkBDtzLbir+anSAEgQ9M6a7ABLoLKU1iy KxBA== X-Forwarded-Encrypted: i=1; AJvYcCUfKooT+txa//4y4s1U5bdTYgO9/SaOHAlup46T4+pe5Q4sEAA58/Hcs6ta/S5Z1eEzvSrYDwThXsWVsSI=@vger.kernel.org X-Gm-Message-State: AOJu0YyfJ0LSYnOQz8q03ycrsPhVpGli/ZNz1nn7yMJEOvTl+2IdN6Jr ovT+aLIrGgEF797ETHOntwt4k2Qi0A1Ro+pcLofxq96b+JMsSijEUQl0C7kMXzNMp+31NMhO5qa lM6aXfA== X-Received: from jabko13.prod.google.com ([2002:a05:6638:8f0d:b0:5ce:aa0c:6674]) (user=avagin job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6820:1622:b0:66e:e7e:6524 with SMTP id 006d021491bc7-677690aef69mr8034820eaf.58.1771351275445; Tue, 17 Feb 2026 10:01:15 -0800 (PST) Date: Tue, 17 Feb 2026 18:01:07 +0000 In-Reply-To: <20260217180108.1420024-1-avagin@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260217180108.1420024-1-avagin@google.com> X-Mailer: git-send-email 2.53.0.310.g728cabbaf7-goog Message-ID: <20260217180108.1420024-4-avagin@google.com> Subject: [PATCH 3/4] mm: synchronize saved_auxv access with arg_lock 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 , Alexander Mikhalitsyn Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The mm->saved_auxv array stores the auxiliary vector, which can be modified via prctl(PR_SET_MM_AUXV) or prctl(PR_SET_MM_MAP). Previously, accesses to saved_auxv were not synchronized. This was a intentional trade-off, as the vector was only used to provide information to userspace via /proc/PID/auxv or prctl(PR_GET_AUXV), and consistency between the auxv values left to userspace. With the introduction of hardware capability (HWCAP) inheritance during execve, the kernel now relies on the contents of saved_auxv to configure the execution environment of new processes. An unsynchronized read during execve could result in a new process inheriting an inconsistent set of capabilities if the parent process updates its auxiliary vector concurrently. While it is still not strictly required to guarantee the consistency of auxv values on the kernel side, doing so is relatively straightforward. This change implements synchronization using arg_lock. Reviewed-by: Alexander Mikhalitsyn Reviewed-by: Cyrill Gorcunov Reviewed-by: Michal Koutn=C3=BD Signed-off-by: Andrei Vagin --- fs/exec.c | 2 ++ fs/proc/base.c | 12 +++++++++--- include/linux/mm_types.h | 1 - kernel/fork.c | 7 ++++++- kernel/sys.c | 29 ++++++++++++++--------------- 5 files changed, 31 insertions(+), 20 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index 9c70776fca9e..8f5fba06aff8 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1801,6 +1801,7 @@ static void inherit_hwcap(struct linux_binprm *bprm) n =3D 1; #endif =20 + spin_lock(&mm->arg_lock); for (i =3D 0; n && i < AT_VECTOR_SIZE; i +=3D 2) { unsigned long type =3D mm->saved_auxv[i]; unsigned long val =3D mm->saved_auxv[i + 1]; @@ -1832,6 +1833,7 @@ static void inherit_hwcap(struct linux_binprm *bprm) n--; } done: + spin_unlock(&mm->arg_lock); mm_flags_set(MMF_USER_HWCAP, bprm->mm); } =20 diff --git a/fs/proc/base.c b/fs/proc/base.c index 4eec684baca9..09d887741268 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1083,14 +1083,20 @@ static ssize_t auxv_read(struct file *file, char __= user *buf, { struct mm_struct *mm =3D file->private_data; unsigned int nwords =3D 0; + unsigned long saved_auxv[AT_VECTOR_SIZE]; =20 if (!mm) return 0; + + spin_lock(&mm->arg_lock); + memcpy(saved_auxv, mm->saved_auxv, sizeof(saved_auxv)); + spin_unlock(&mm->arg_lock); + do { nwords +=3D 2; - } while (mm->saved_auxv[nwords - 2] !=3D 0); /* AT_NULL */ - return simple_read_from_buffer(buf, count, ppos, mm->saved_auxv, - nwords * sizeof(mm->saved_auxv[0])); + } while (saved_auxv[nwords - 2] !=3D 0); /* AT_NULL */ + return simple_read_from_buffer(buf, count, ppos, saved_auxv, + nwords * sizeof(saved_auxv[0])); } =20 static const struct file_operations proc_auxv_operations =3D { diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 2f3c6ad48c0a..d1a95b90e448 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -1254,7 +1254,6 @@ struct mm_struct { unsigned long start_code, end_code, start_data, end_data; unsigned long start_brk, brk, start_stack; unsigned long arg_start, arg_end, env_start, env_end; - unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */ =20 #ifdef CONFIG_ARCH_HAS_ELF_CORE_EFLAGS diff --git a/kernel/fork.c b/kernel/fork.c index 4c92a2bc3cbb..e17e57e29b6a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1105,8 +1105,13 @@ static struct mm_struct *mm_init(struct mm_struct *m= m, struct task_struct *p, __mm_flags_overwrite_word(mm, mmf_init_legacy_flags(flags)); mm->def_flags =3D current->mm->def_flags & VM_INIT_DEF_MASK; =20 - if (mm_flags_test(MMF_USER_HWCAP, current->mm)) + if (mm_flags_test(MMF_USER_HWCAP, current->mm)) { + spin_lock(¤t->mm->arg_lock); mm_flags_set(MMF_USER_HWCAP, mm); + memcpy(mm->saved_auxv, current->mm->saved_auxv, + sizeof(mm->saved_auxv)); + spin_unlock(¤t->mm->arg_lock); + } } else { __mm_flags_overwrite_word(mm, default_dump_filter); mm->def_flags =3D 0; diff --git a/kernel/sys.c b/kernel/sys.c index e4b0fa2f6845..c679b5797e73 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2147,20 +2147,11 @@ static int prctl_set_mm_map(int opt, const void __u= ser *addr, unsigned long data mm->arg_end =3D prctl_map.arg_end; mm->env_start =3D prctl_map.env_start; mm->env_end =3D prctl_map.env_end; - spin_unlock(&mm->arg_lock); - - /* - * Note this update of @saved_auxv is lockless thus - * if someone reads this member in procfs while we're - * updating -- it may get partly updated results. It's - * known and acceptable trade off: we leave it as is to - * not introduce additional locks here making the kernel - * more complex. - */ if (prctl_map.auxv_size) { - memcpy(mm->saved_auxv, user_auxv, sizeof(user_auxv)); mm_flags_set(MMF_USER_HWCAP, mm); + memcpy(mm->saved_auxv, user_auxv, sizeof(user_auxv)); } + spin_unlock(&mm->arg_lock); =20 mmap_read_unlock(mm); return 0; @@ -2190,10 +2181,10 @@ static int prctl_set_auxv(struct mm_struct *mm, uns= igned long addr, =20 BUILD_BUG_ON(sizeof(user_auxv) !=3D sizeof(mm->saved_auxv)); =20 - task_lock(current); - memcpy(mm->saved_auxv, user_auxv, len); + spin_lock(&mm->arg_lock); mm_flags_set(MMF_USER_HWCAP, mm); - task_unlock(current); + memcpy(mm->saved_auxv, user_auxv, len); + spin_unlock(&mm->arg_lock); =20 return 0; } @@ -2481,9 +2472,17 @@ static inline int prctl_get_mdwe(unsigned long arg2,= unsigned long arg3, static int prctl_get_auxv(void __user *addr, unsigned long len) { struct mm_struct *mm =3D current->mm; + unsigned long auxv[AT_VECTOR_SIZE]; unsigned long size =3D min_t(unsigned long, sizeof(mm->saved_auxv), len); =20 - if (size && copy_to_user(addr, mm->saved_auxv, size)) + if (!size) + return sizeof(mm->saved_auxv); + + spin_lock(&mm->arg_lock); + memcpy(auxv, mm->saved_auxv, size); + spin_unlock(&mm->arg_lock); + + if (copy_to_user(addr, auxv, size)) return -EFAULT; return sizeof(mm->saved_auxv); } --=20 2.53.0.310.g728cabbaf7-goog From nobody Fri Apr 3 04:45:49 2026 Received: from mail-oo1-f74.google.com (mail-oo1-f74.google.com [209.85.161.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 E8281371062 for ; Tue, 17 Feb 2026 18:01:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771351279; cv=none; b=H/EmxH3AUYy0fFL88+i91raoJdmXx0jo6Tl89Peamg3ykeuE1mOE85cpldJMvZWGsw9XKx8PYmKaJOI/Bu6om5lGfo/ucLJeN4fDRZclUemSVN/VulcMKnx+X8TFI3gRw0NUZ8M+z0cLKFljbS8tW8GWekwb+cOTs/v/DqsaWLA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771351279; c=relaxed/simple; bh=d+eR56orlGEr6nfiFJte0fb3pZg0EvdkJb1SI7KO4d4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gBpEmFlb1KSgYJTUQjGJAZcYhJmcu5lXPB+v2Atb0s9c5Z8IaL9rCZl4OPAInhYci+HKFazMwQWz3cfyZKG6ajuAQ/QYdSJAtqPQBytg+bil6Qz/sK5QNAStpkLaJIyvxmZ7Qate8me5WPdEo+lQaQZOGTnaiidX2Pzwj0JDdtc= 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=4FRdk027; arc=none smtp.client-ip=209.85.161.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="4FRdk027" Received: by mail-oo1-f74.google.com with SMTP id 006d021491bc7-663019e3e05so15053487eaf.3 for ; Tue, 17 Feb 2026 10:01:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771351277; x=1771956077; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=2fimtsUyJng+2uYEqG9RtpHODLieBKKBpfLX8kY/jM0=; b=4FRdk027ohoO0aIhWLO5hjCOxWfKbe6wWPq/AOKVq+BeXlU6gib3RIePIRokafda9B r5+YdHqMcPD7tjCAhG7X2YWJb5hE6Y0KZAYtf7JuD2Z+k8yNfb0bMqnE6Oe70JgI71Ow q0ym8Zx+KWqlnscJzpAoC8x0SgiHGVqsgERnlrvVQPsv5krKRzG1OxWpwt3f7ZC5bhqy wQl++Os/fPODqggaCjcgFugtZ2uwzqkcnJHm+q/n8s6vj/sfzcf2tTv8lmEy72bslEZd Tb3lDcuxd+pMbXpBu3DnVLGbH2wyyUbyXqdRhs5IClihdDQXApGQYTZDlv+voTuBZEdN rDcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771351277; x=1771956077; h=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=2fimtsUyJng+2uYEqG9RtpHODLieBKKBpfLX8kY/jM0=; b=UYXAst9axv7LSg/DYB0vDvw/PZlxRwZ0V8GjLHvyKNkopToFWl87mWLD7q1Gxnyrjv EN+ilU88mvtWiQRYLI+luIPc0zkiL+WAe9IWwQ/RYHrkNqSpXVrJnZdlpTczUW4+pHft Dtf0fS7zfY6HT1q4sHbAffE7XNOXsmoQEiQipjeJ9Qm/pjf9I5eJWVnpG86f0v/HQQLi 997LZIMm1kFrSU22I2wjQvAv3b1C3QS8WJ8P3pQE6QIogu1P/6K0kxe3bRqFJC2vowCP Ra6NHB5VVuGu28FCvgJoTs23NnRepZL+pGmftTmj/9ES+ZNclbw69jnTGW9t63qb1YiH Gccg== X-Forwarded-Encrypted: i=1; AJvYcCVUjTI9giowJh64fzN1M9HKkAZHh7U/TkrjeDeCKhrakhqJ/3u8gCXxMXVcnjNOBdGeqp1icJK0As5Nlqg=@vger.kernel.org X-Gm-Message-State: AOJu0YzruipUxbl5gB0attl25XflG1NOH4QewndybShMNgtvlQmakIwh D/sBWu1Z5Ov0TKH94sPyE2Q6uwcmJARSmcEWmlUVON+UA75EM+D/mHsGykxH2eMIQ5TBpj/0lIS 8L/3+KQ== X-Received: from jabel13.prod.google.com ([2002:a05:6638:4d8d:b0:5ca:f895:d03b]) (user=avagin job=prod-delivery.src-stubby-dispatcher) by 2002:a4a:ec44:0:b0:659:890b:3f9 with SMTP id 006d021491bc7-67858ef3a65mr6049899eaf.4.1771351276862; Tue, 17 Feb 2026 10:01:16 -0800 (PST) Date: Tue, 17 Feb 2026 18:01:08 +0000 In-Reply-To: <20260217180108.1420024-1-avagin@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260217180108.1420024-1-avagin@google.com> X-Mailer: git-send-email 2.53.0.310.g728cabbaf7-goog Message-ID: <20260217180108.1420024-5-avagin@google.com> Subject: [PATCH 4/4] selftests/exec: add test for HWCAP inheritance 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 , Alexander Mikhalitsyn Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Verify that HWCAPs are correctly inherited/preserved across execve() when modified via prctl(PR_SET_MM_AUXV). The test performs the following steps: * reads the current AUXV using prctl(PR_GET_AUXV); * finds an HWCAP entry and toggles its most significant bit; * replaces the AUXV of the current process with the modified one using prctl(PR_SET_MM, PR_SET_MM_AUXV); * executes itself to verify that the new program sees the modified HWCAP value. Reviewed-by: Alexander Mikhalitsyn Reviewed-by: Cyrill Gorcunov Reviewed-by: Kees Cook Signed-off-by: Andrei Vagin --- tools/testing/selftests/exec/.gitignore | 1 + tools/testing/selftests/exec/Makefile | 1 + tools/testing/selftests/exec/hwcap_inherit.c | 105 +++++++++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 tools/testing/selftests/exec/hwcap_inherit.c diff --git a/tools/testing/selftests/exec/.gitignore b/tools/testing/selfte= sts/exec/.gitignore index 7f3d1ae762ec..2ff245fd0ba6 100644 --- a/tools/testing/selftests/exec/.gitignore +++ b/tools/testing/selftests/exec/.gitignore @@ -19,3 +19,4 @@ null-argv xxxxxxxx* pipe S_I*.test +hwcap_inherit \ No newline at end of file diff --git a/tools/testing/selftests/exec/Makefile b/tools/testing/selftest= s/exec/Makefile index 45a3cfc435cf..e73005965e05 100644 --- a/tools/testing/selftests/exec/Makefile +++ b/tools/testing/selftests/exec/Makefile @@ -20,6 +20,7 @@ TEST_FILES :=3D Makefile TEST_GEN_PROGS +=3D recursion-depth TEST_GEN_PROGS +=3D null-argv TEST_GEN_PROGS +=3D check-exec +TEST_GEN_PROGS +=3D hwcap_inherit =20 EXTRA_CLEAN :=3D $(OUTPUT)/subdir.moved $(OUTPUT)/execveat.moved $(OUTPUT)= /xxxxx* \ $(OUTPUT)/S_I*.test diff --git a/tools/testing/selftests/exec/hwcap_inherit.c b/tools/testing/s= elftests/exec/hwcap_inherit.c new file mode 100644 index 000000000000..1b43b2dbb1d0 --- /dev/null +++ b/tools/testing/selftests/exec/hwcap_inherit.c @@ -0,0 +1,105 @@ +// SPDX-License-Identifier: GPL-2.0 + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../kselftest.h" + +static int find_msb(unsigned long v) +{ + return sizeof(v)*8 - __builtin_clzl(v) - 1; +} + +int main(int argc, char *argv[]) +{ + unsigned long auxv[1024], hwcap, new_hwcap, hwcap_idx; + int size, hwcap_type =3D 0, hwcap_feature, count, status; + char hwcap_str[32], hwcap_type_str[32]; + pid_t pid; + + if (argc > 1 && strcmp(argv[1], "verify") =3D=3D 0) { + unsigned long type =3D strtoul(argv[2], NULL, 16); + unsigned long expected =3D strtoul(argv[3], NULL, 16); + unsigned long hwcap =3D getauxval(type); + + if (hwcap !=3D expected) { + ksft_print_msg("HWCAP mismatch: type %lx, expected %lx, got %lx\n", + type, expected, hwcap); + return 1; + } + ksft_print_msg("HWCAP matched: %lx\n", hwcap); + return 0; + } + + ksft_print_header(); + ksft_set_plan(1); + + size =3D prctl(PR_GET_AUXV, auxv, sizeof(auxv), 0, 0); + if (size =3D=3D -1) + ksft_exit_fail_perror("prctl(PR_GET_AUXV)"); + + count =3D size / sizeof(unsigned long); + + /* Find the "latest" feature and try to mask it out. */ + for (int i =3D 0; i < count - 1; i +=3D 2) { + hwcap =3D auxv[i + 1]; + if (hwcap =3D=3D 0) + continue; + switch (auxv[i]) { + case AT_HWCAP4: + case AT_HWCAP3: + case AT_HWCAP2: + case AT_HWCAP: + hwcap_type =3D auxv[i]; + hwcap_feature =3D find_msb(hwcap); + hwcap_idx =3D i + 1; + break; + default: + continue; + } + } + if (hwcap_type =3D=3D 0) + ksft_exit_skip("No features found, skipping test\n"); + hwcap =3D auxv[hwcap_idx]; + new_hwcap =3D hwcap ^ (1UL << hwcap_feature); + auxv[hwcap_idx] =3D new_hwcap; + + if (prctl(PR_SET_MM, PR_SET_MM_AUXV, auxv, size, 0) < 0) { + if (errno =3D=3D EPERM) + ksft_exit_skip("prctl(PR_SET_MM_AUXV) requires CAP_SYS_RESOURCE\n"); + ksft_exit_fail_perror("prctl(PR_SET_MM_AUXV)"); + } + + pid =3D fork(); + if (pid < 0) + ksft_exit_fail_perror("fork"); + if (pid =3D=3D 0) { + char *new_argv[] =3D { argv[0], "verify", hwcap_type_str, hwcap_str, NUL= L }; + + snprintf(hwcap_str, sizeof(hwcap_str), "%lx", new_hwcap); + snprintf(hwcap_type_str, sizeof(hwcap_type_str), "%x", hwcap_type); + + execv(argv[0], new_argv); + perror("execv"); + exit(1); + } + + if (waitpid(pid, &status, 0) =3D=3D -1) + ksft_exit_fail_perror("waitpid"); + if (status !=3D 0) + ksft_exit_fail_msg("HWCAP inheritance failed (status %d)\n", status); + + ksft_test_result_pass("HWCAP inheritance succeeded\n"); + ksft_exit_pass(); + return 0; +} --=20 2.53.0.310.g728cabbaf7-goog