[ Sasha's backport helper bot ]
Hi,
Found matching upstream commit: 0210d251162f4033350a94a43f95b1c39ec84a90
Status in newer kernel trees:
6.12.y | Not found
6.6.y | Not found
6.1.y | Not found
5.15.y | Not found
5.10.y | Not found
Note: The patch differs from the upstream commit:
---
1: 0210d251162f ! 1: e4b874815eaf scripts/sorttable: fix orc_sort_cmp() to maintain symmetry and transitivity
@@ Commit message
The orc_sort_cmp() function, used with qsort(), previously violated the
symmetry and transitivity rules required by the C standard. Specifically,
- when both entries are ORC_TYPE_UNDEFINED, it could result in both a < b
+ when both entries are ORC_REG_UNDEFINED, it could result in both a < b
and b < a, which breaks the required symmetry and transitivity. This can
lead to undefined behavior and incorrect sorting results, potentially
causing memory corruption in glibc implementations [1].
@@ Commit message
Transitivity: If x < y and y < z, then x < z.
Fix the comparison logic to return 0 when both entries are
- ORC_TYPE_UNDEFINED, ensuring compliance with qsort() requirements.
+ ORC_REG_UNDEFINED, ensuring compliance with qsort() requirements.
Link: https://www.qualys.com/2024/01/30/qsort.txt [1]
Link: https://lkml.kernel.org/r/20241226140332.2670689-1-visitorckw@xxxxxxxxx
@@ Commit message
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
+ (cherry picked from commit 0210d251162f4033350a94a43f95b1c39ec84a90)
+ Signed-off-by: Kuan-Wei Chiu <visitorckw@xxxxxxxxx>
## scripts/sorttable.h ##
@@ scripts/sorttable.h: static inline unsigned long orc_ip(const int *ip)
@@ scripts/sorttable.h: static inline unsigned long orc_ip(const int *ip)
const int *b = g_orc_ip_table + *(int *)_b;
unsigned long a_val = orc_ip(a);
@@ scripts/sorttable.h: static int orc_sort_cmp(const void *_a, const void *_b)
+ * These terminator entries exist to handle any gaps created by
* whitelisted .o files which didn't get objtool generation.
*/
- orc_a = g_orc_table + (a - g_orc_ip_table);
+- orc_a = g_orc_table + (a - g_orc_ip_table);
+- return orc_a->sp_reg == ORC_REG_UNDEFINED && !orc_a->end ? -1 : 1;
++ orc_a = g_orc_table + (a - g_orc_ip_table);
+ orc_b = g_orc_table + (b - g_orc_ip_table);
-+ if (orc_a->type == ORC_TYPE_UNDEFINED && orc_b->type == ORC_TYPE_UNDEFINED)
++ if (orc_a->sp_reg == ORC_REG_UNDEFINED && !orc_a->end &&
++ orc_b->sp_reg == ORC_REG_UNDEFINED && !orc_b->end)
+ return 0;
- return orc_a->type == ORC_TYPE_UNDEFINED ? -1 : 1;
++ return orc_a->sp_reg == ORC_REG_UNDEFINED && !orc_a->end ? -1 : 1;
}
+ static void *sort_orctable(void *arg)
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.10.y | Success | Success |
