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

Commit 144ecf31 authored by Stefani Seibold's avatar Stefani Seibold Committed by Linus Torvalds
Browse files

kfifo: fix kfifo_alloc() to return a signed int value 



Add a new __kfifo_int_must_check_helper() helper function, which is needed
for kfifo_alloc() to return the right signed integer value.

The origin __kfifo_must_check_helper() helper was renamed into
__kfifo_uint_must_check_helper() to show the sign which is expected and
returned.

(And revert the temporary disabling of __kfifo_must_check_helper())

Signed-off-by: default avatarStefani Seibold <stefani@seibold.net>
Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 12aa4c64

include/linux/kfifo.h

+21 −12
Original line number Diff line number Diff line
@@ -171,8 +171,17 @@ struct kfifo_rec_ptr_2 __STRUCT_KFIFO_PTR(unsigned char, 2, void); 
	}





/* __kfifo_must_check_helper() is temporarily disabled because it was faulty */

#define __kfifo_must_check_helper(x) (x)

static inline unsigned int __must_check

__kfifo_uint_must_check_helper(unsigned int val)

{

	return val;

}



static inline int __must_check

__kfifo_int_must_check_helper(int val)

{

	return val;

}



/**

 * kfifo_initialized - Check if the fifo is initialized
@@ -264,7 +273,7 @@ struct kfifo_rec_ptr_2 __STRUCT_KFIFO_PTR(unsigned char, 2, void); 
 * @fifo: address of the fifo to be used

 */

#define	kfifo_avail(fifo) \

__kfifo_must_check_helper( \

__kfifo_uint_must_check_helper( \

({ \

	typeof((fifo) + 1) __tmpq = (fifo); \

	const size_t __recsize = sizeof(*__tmpq->rectype); \
@@ -297,7 +306,7 @@ __kfifo_must_check_helper( \ 
 * This function returns the size of the next fifo record in number of bytes.

 */

#define kfifo_peek_len(fifo) \

__kfifo_must_check_helper( \

__kfifo_uint_must_check_helper( \

({ \

	typeof((fifo) + 1) __tmp = (fifo); \

	const size_t __recsize = sizeof(*__tmp->rectype); \
@@ -320,7 +329,7 @@ __kfifo_must_check_helper( \ 
 * Return 0 if no error, otherwise an error code.

 */

#define kfifo_alloc(fifo, size, gfp_mask) \

__kfifo_must_check_helper( \

__kfifo_int_must_check_helper( \

({ \

	typeof((fifo) + 1) __tmp = (fifo); \

	struct __kfifo *__kfifo = &__tmp->kfifo; \
@@ -416,7 +425,7 @@ __kfifo_must_check_helper( \ 
 * writer, you don't need extra locking to use these macro.

 */

#define	kfifo_get(fifo, val) \

__kfifo_must_check_helper( \

__kfifo_uint_must_check_helper( \

({ \

	typeof((fifo) + 1) __tmp = (fifo); \

	typeof((val) + 1) __val = (val); \
@@ -457,7 +466,7 @@ __kfifo_must_check_helper( \ 
 * writer, you don't need extra locking to use these macro.

 */

#define	kfifo_peek(fifo, val) \

__kfifo_must_check_helper( \

__kfifo_uint_must_check_helper( \

({ \

	typeof((fifo) + 1) __tmp = (fifo); \

	typeof((val) + 1) __val = (val); \
@@ -549,7 +558,7 @@ __kfifo_must_check_helper( \ 
 * writer, you don't need extra locking to use these macro.

 */

#define	kfifo_out(fifo, buf, n) \

__kfifo_must_check_helper( \

__kfifo_uint_must_check_helper( \

({ \

	typeof((fifo) + 1) __tmp = (fifo); \

	typeof((buf) + 1) __buf = (buf); \
@@ -577,7 +586,7 @@ __kfifo_must_check_helper( \ 
 * copied.

 */

#define	kfifo_out_spinlocked(fifo, buf, n, lock) \

__kfifo_must_check_helper( \

__kfifo_uint_must_check_helper( \

({ \

	unsigned long __flags; \

	unsigned int __ret; \
@@ -606,7 +615,7 @@ __kfifo_must_check_helper( \ 
 * writer, you don't need extra locking to use these macro.

 */

#define	kfifo_from_user(fifo, from, len, copied) \

__kfifo_must_check_helper( \

__kfifo_uint_must_check_helper( \

({ \

	typeof((fifo) + 1) __tmp = (fifo); \

	const void __user *__from = (from); \
@@ -634,7 +643,7 @@ __kfifo_must_check_helper( \ 
 * writer, you don't need extra locking to use these macro.

 */

#define	kfifo_to_user(fifo, to, len, copied) \

__kfifo_must_check_helper( \

__kfifo_uint_must_check_helper( \

({ \

	typeof((fifo) + 1) __tmp = (fifo); \

	void __user *__to = (to); \
@@ -761,7 +770,7 @@ __kfifo_must_check_helper( \ 
 * writer, you don't need extra locking to use these macro.

 */

#define	kfifo_out_peek(fifo, buf, n) \

__kfifo_must_check_helper( \

__kfifo_uint_must_check_helper( \

({ \

	typeof((fifo) + 1) __tmp = (fifo); \

	typeof((buf) + 1) __buf = (buf); \