Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb8b3efe authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Prakruthi Deepak Heragu
Browse files

lib/list_sort: fix function type mismatches 



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: 043b3f7b ("lib/list_sort: simplify and remove MAX_LIST_LENGTH_BITS")
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com&gt;i>
Git-commit: 5bc3f3591d783484b2e0011f3b5633c1e60e7585
Git-repo: https://github.com/samitolvanen/linux.git


Signed-off-by: default avatarPrakruthi Deepak Heragu <pheragu@codeaurora.org>
parent 4c77e0c0

lib/list_sort.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */