From:   Tianyi Liu <i.pear@outlook.com>
To:     arnd@arndb.de
Cc:     hjl.tools@gmail.com, linux-arch@vger.kernel.org,
        linux-kernel@vger.kernel.org, bpf@vger.kernel.org,
        Tianyi Liu <i.pear@outlook.com>
Subject: [PATCH] Discard .note.gnu.property in vmlinux
Date:   Wed,  1 Mar 2023 14:22:32 +0800
Message-ID: <SY4P282MB108446E9ED9FB180AE717D5F9DAD9@SY4P282MB1084.AUSP282.PROD.OUTLOOK.COM>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: SY4P282MB1084:EE_|SYBP282MB2253:EE_
X-MS-Office365-Filtering-Correlation-Id: 46010a48-f4e7-413c-5275-08db1a1d7c9c
X-MS-Exchange-SLBlob-MailProps: dx7TrgQSB6dAG8fEwqdvu3P4kJ8WfkSHJ/VyhTx8G9lQ63vz0cpjlF0PTPFU90JWrhUDsZh2UrTbxav7ZEEqVMwz6tVouVW6S0jVrctywqGkGCm394seECzmhJOGIKyC0t9p7P+HNshvJZCo5L0egl8WVf1UOiAfNwAmqPysfxrzs8RgBOnpDFtxKMmsSP4RlHJcCazNeW9x48el0TfxU4WWyHt+oDWEnlL+4X4e8PGF+a3i62aVZzUK9jEafJMNTir4NPAdBha5bNTXxVDETkpblzopb4c5UcA8JfYQ8Hv5nKKlH/ZoUJz3L8MN+Z8/KqLyY718xminA2ewHeMurD1mtZrKXRtH3GXKXbZZ0uHXt9LvEHULqJmK2KM2ScI69f+ZPdQQ/Esqkq3sbrNypMd9i6pfXkT6Ao4lCLy/PMJpsCY4JtC7vBbF9j0vb0iqChvglhlDjY5TGd8WnADfqEtZXdHhqWCihA/g1uE4HPqc6aYdiUcCK8jKW4z9nc/UzvFBSVlq6xckSdbdjexmwefRsiUvNS13RI8i6tpsgaX6NkMnFQvkUkmAszF8pSj7Ll5BAVfYt9eyggmuDGoYNndqayAGpIc+B2XJsAnuSXS7SEx6GYomMPvbZUrL36WJlpyLJw28ehev0VgrhXktyRBnZvypKhIJzbuN5WPwD4htY3Yb6I4BkrkfJ0rfDfvEm9cFYNPOslyfBupw2LvapTlNPdJdx8zzyMFVs/Nv/kCIuJG6CE9OQLxgVLvWRDT3vtQ8adSEYAA=
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: ERm/MND+5l46Mg9aenW+YCkEL+FTZdSY1pKwsJqLoUor0rj3Lx18SJTKaQJ3A7hxG/VuOjXiiVFfETf1brk0hp6U3cg4xb9uDpp5BaWz/tOaLjOsXo9o23NXS5H7bqB2rbQkXzI4c+uL0vI/YUwb6P6Ddt/K82YpZeI61701eBDxG0/3S264NuerRA5ERzXp6ZGYFI10Y2OkV5tj6m5mk7sQnHpSBMn0E8EyMaylWSCbC0u8YxXws6p81OWqCneMx1A2+p4LRHI0DzfoQPSpQOAsrZ9JFDgYZ4BCfFWZm/CHJ9que2BIiN2gteEYlUIr9X02JJpLltcDPyq4kZDUSRtuKQ5QXVaylM0dllAARN6fgAO8jMyqG4qxUCyl1eQub0bqb5656Ks++e+WonNcV19fY4Rmf8evBFuh2p8xwyB3fMtuVCKKIhpzXIXGcjZQrRIueII11MEZww/cs/6dwFm7ibPwYmJpF1IOp0bOPrNyR0gD+Zq7MFz8Xd3iiftlJ+kQKxstM30tZxik2MQDceFNijLl1p+LpFhHReKYFNMwtt+OcdKdpBG+RKmdTabMj0+DZKLe8sEZWPsHy/e+DxA5RO2stSMdc5Pm10W/9Eha/6rtJGESTuva7HzpJxosdClPF9ljUYRBERgcVmXYcQM4MHlSrUXVJmJLD/MGJB+USE7+/x82HzBO9lgANLEh
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?U00cSVtQtoK1N2vZAExvgRYj/caskImZMiYAKc1qxb7sAEpxj7AxGlnzedyi?=
 =?us-ascii?Q?pcj9dAPAjuJdkmIuFK2d2XaErW2z3OR7SXk450d9dwNsALrIGyn4zsY1t0Uu?=
 =?us-ascii?Q?xgmyJs+cQkYfFWiUQTWsQ4xt4IAZj8+Lgcc2DPFnB23K2EsVllf+By8BJ7gk?=
 =?us-ascii?Q?IBBkmF4eFJfgoaEn7qr7fA+1rPIJEgjU98PbR2PvgiK/YZ0QqZfeo1PtS5q2?=
 =?us-ascii?Q?xEWTqMCq/zJxPF2hhEI8xoU3ATMwRxPd+8FeE9ryG75gVUTJZkD2me+a7z7u?=
 =?us-ascii?Q?RMCM9tjViMEHjvZ9MdeluOD/5+wf/UXBsb8SFcHvS479ezKaIjkvsZ7q252s?=
 =?us-ascii?Q?mXeb9LE1R3iPT6QjlxxKDym7Rd28qfasNWpK8FjczY5LOzueigyi8fUwUWRt?=
 =?us-ascii?Q?j7orfR4SXFNLAQVVGS/HoynhmeQUk2IBiXBFwfIbV1PkLMD7fRqw94S3yxcA?=
 =?us-ascii?Q?HEqRncHS/DXuGdiBVexN6hv/f918M3zbYBQ6U9YFzAPQHbX7YKQcClI+WkIq?=
 =?us-ascii?Q?cUCzIFWHXxLyUsobUnwYgKPQLLjwzZgnPcs56B8hu3+wHkPlR3GxPGYFWYeW?=
 =?us-ascii?Q?1BQrUOiLXDsY2rc2MSwEfalM3GgF4wVvIlc9vigpLlVHQ9lYTVYwHz9yo5ra?=
 =?us-ascii?Q?2+gyxYYgltxFC61csOOqrrTMAYaLmOQ+akSOKOY+npPq16caVC6deWew9HDM?=
 =?us-ascii?Q?icbyk7fbDGA1VnC3weSO6wLxJP4oaIcTw0BALnRRKQaCt71DJomdIU+kHb1r?=
 =?us-ascii?Q?/3rr57KSA04Bf2Mx07LuywPH9biUCDqGZ96Gb3tCmm8EXES76pggOOq48SMs?=
 =?us-ascii?Q?vY2SLP7rJrAZmKwGU0N4lWNTyp475CDYAdST0WTU/IFggHom0lLg3/1KXqMg?=
 =?us-ascii?Q?gxveG6/Qs528kblzsW/mI8Ahe8WSac1BxvGNRJRpCP4LhGwrxvnVibHrZ0vp?=
 =?us-ascii?Q?fepqYpnkO1g/EIO6NKzdmMssIaAjfRbYFqXyL1WpLYU+89mKnu03QgslzK3f?=
 =?us-ascii?Q?Zf8pHixHjzToxQNoWjwjljrFZzVOlrUVFhnwVUjkMIDQuiTvDz5mRxVwEX2L?=
 =?us-ascii?Q?t5LxTIjyqeHkYeGrYlA4BEkEvqMchOR3PFlP2MgBPb/qOLmhQljzRTXTYZkR?=
 =?us-ascii?Q?1MgUNVuwrrtJnpY1llPFFEpRkYCIOW72lQdr/5049EpJ6MvG9qlzvv8adls1?=
 =?us-ascii?Q?byqiL0JsJEL0bAJ34L4FkfIB4ejWasF2OEI1TnmT8FKmvRWqdN9Br08W8yNR?=
 =?us-ascii?Q?Fa2rAY2ssXryVDOLBEz954UQqDAW+6VPEwfg89m+kasypEKYKICJTRQD5GQW?=
 =?us-ascii?Q?cis=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 46010a48-f4e7-413c-5275-08db1a1d7c9c
X-MS-Exchange-CrossTenant-AuthSource: SY4P282MB1084.AUSP282.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2023 06:23:35.1455
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SYBP282MB2253
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When the kernel image is finally linked, all the notes are packed into a
single .notes section, but these notes may have different alignments.

binutils above 2.32 adds a ".note.gnu.property" section to the compiled
output, which is 4-byte aligned on 32-bit, but 8-byte aligned on 64-bit.
At present, the notes generated by both the ELFNOTE macro and the VDSO
linker script are 4-byte aligned. So in a 64-bit kernel, packing segments
with different alignments will cause LibElf and tools like readelf to
crush or to read wrong values [1][2].

This patch discards ".note.gnu.property" from vmlinux.

Note that H.J. Lu has submitted a similar patch in the past[3],
but it was not merged.

[1] https://lore.kernel.org/bpf/57830c30-cd77-40cf-9cd1-3bb608aa602e@app.fastmail.com/
[2] https://lore.kernel.org/linux-arm-kernel/20210428172847.GC4022@arm.com/
[3] https://lore.kernel.org/lkml/20180924201459.35923-1-hjl.tools@gmail.com/

Signed-off-by: Tianyi Liu <i.pear@outlook.com>
---
 include/asm-generic/vmlinux.lds.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index d1f57e4868ed..6db0f664c7d6 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -891,9 +891,13 @@
 /*
  * Discard .note.GNU-stack, which is emitted as PROGBITS by the compiler.
  * Otherwise, the type of .notes section would become PROGBITS instead of NOTES.
+ *
+ * Discard .note.gnu.property, which is 8-byte aligned and emitted by the
+ * compiler. Otherwise, the .notes section will be 8-byte aligned and other
+ * notes cannot be read.
  */
 #define NOTES								\
-	/DISCARD/ : { *(.note.GNU-stack) }				\
+	/DISCARD/ : { *(.note.GNU-stack) *(.note.gnu.property) }				\
 	.notes : AT(ADDR(.notes) - LOAD_OFFSET) {			\
 		BOUNDED_SECTION_BY(.note.*, _notes)			\
 	} NOTES_HEADERS							\
-- 
2.39.2