Skip to content

Commit 5538213

Browse files
GONG, Ruiqipcmoore
authored andcommitted
capability: erase checker warnings about struct __user_cap_data_struct
Currently Sparse warns the following when compiling kernel/capability.c: kernel/capability.c:191:35: warning: incorrect type in argument 2 (different address spaces) kernel/capability.c:191:35: expected void const *from kernel/capability.c:191:35: got struct __user_cap_data_struct [noderef] __user * kernel/capability.c:168:14: warning: dereference of noderef expression ...... (multiple noderef warnings on different locations) kernel/capability.c:244:29: warning: incorrect type in argument 1 (different address spaces) kernel/capability.c:244:29: expected void *to kernel/capability.c:244:29: got struct __user_cap_data_struct [noderef] __user ( * )[2] kernel/capability.c:247:42: warning: dereference of noderef expression ...... (multiple noderef warnings on different locations) It seems that defining `struct __user_cap_data_struct` together with `cap_user_data_t` make Sparse believe that the struct is `noderef` as well. Separate their definitions to clarify their respective attributes. Signed-off-by: GONG, Ruiqi <gongruiqi@huaweicloud.com> Acked-by: Serge Hallyn <serge@hallyn.com> [PM: wrapped long lines in the description] Signed-off-by: Paul Moore <paul@paul-moore.com>
1 parent 4432b50 commit 5538213

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

include/uapi/linux/capability.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@ typedef struct __user_cap_header_struct {
4141
int pid;
4242
} __user *cap_user_header_t;
4343

44-
typedef struct __user_cap_data_struct {
44+
struct __user_cap_data_struct {
4545
__u32 effective;
4646
__u32 permitted;
4747
__u32 inheritable;
48-
} __user *cap_user_data_t;
48+
};
49+
typedef struct __user_cap_data_struct __user *cap_user_data_t;
4950

5051

5152
#define VFS_CAP_REVISION_MASK 0xFF000000

0 commit comments

Comments
 (0)