android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/list_sort: fix function type mismatches

Browse Source 
Casting the comparison function to a different type trips indirect call
Control-Flow Integrity (CFI) checking. Remove the additional consts from
cmp_func, and the now unneeded casts.

Change-Id: Ie21cfb8bbc75632e4d96b44cf3f0c3d3331d7fa0
Fixes: 043b3f7 ("lib/list_sort: simplify and remove MAX_LIST_LENGTH_BITS")
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>i
Git-commit: 5bc3f3591d783484b2e0011f3b5633c1e60e7585
Git-repo: https://github.com/samitolvanen/linux.git
Signed-off-by: Prakruthi Deepak Heragu <pheragu@codeaurora.org>
This commit is contained in:
Sami Tolvanen 2020-02-11 12:12:51 -08:00 committed by Prakruthi Deepak Heragu
parent 4c77e0c054
commit eb8b3efece
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/list_sort.c
View File

@ -8,7 +8,7 @@
#include <linux/list.h>
typedef int __attribute__((nonnull(2,3))) (*cmp_func)(void *,
struct list_head const *, struct list_head const *);
struct list_head *, struct list_head *);
/*
* Returns a list organized in an intermediate format suited
@ -227,7 +227,7 @@ void list_sort(void *priv, struct list_head *head,
if (likely(bits)) {
struct list_head *a = *tail, *b = a->prev;
a = merge(priv, (cmp_func)cmp, b, a);
a = merge(priv, cmp, b, a);
/* Install the merged result in place of the inputs */
a->prev = b->prev;
*tail = a;
@ -249,7 +249,7 @@ void list_sort(void *priv, struct list_head *head,
if (!next)
break;
list = merge(priv, (cmp_func)cmp, pending, list);
list = merge(priv, cmp, pending, list);
pending = next;
}
/* The final merge, rebuilding prev links */