Commit 8a866fee authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab

kfifo: DECLARE_KIFO_PTR(fifo, u64) does not work on arm 32 bit

If you try to store u64 in a kfifo (or a struct with u64 members),
then the buf member of __STRUCT_KFIFO_PTR will cause 4 bytes
padding due to alignment (note that struct __kfifo is 20 bytes
on 32 bit).

That in turn causes the __is_kfifo_ptr() to fail, which is caught
by kfifo_alloc(), which now returns EINVAL.

So, ensure that __is_kfifo_ptr() compares to the right structure.
Signed-off-by: default avatarSean Young <sean@mess.org>
Acked-by: default avatarStefani Seibold <stefani@seibold.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 62d6f199
...@@ -113,7 +113,8 @@ struct kfifo_rec_ptr_2 __STRUCT_KFIFO_PTR(unsigned char, 2, void); ...@@ -113,7 +113,8 @@ struct kfifo_rec_ptr_2 __STRUCT_KFIFO_PTR(unsigned char, 2, void);
* array is a part of the structure and the fifo type where the array is * array is a part of the structure and the fifo type where the array is
* outside of the fifo structure. * outside of the fifo structure.
*/ */
#define __is_kfifo_ptr(fifo) (sizeof(*fifo) == sizeof(struct __kfifo)) #define __is_kfifo_ptr(fifo) \
(sizeof(*fifo) == sizeof(STRUCT_KFIFO_PTR(typeof(*(fifo)->type))))
/** /**
* DECLARE_KFIFO_PTR - macro to declare a fifo pointer object * DECLARE_KFIFO_PTR - macro to declare a fifo pointer object
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment