selinux: Fix classmap for BPF
PATCH 1/1 selinux: Fix classmap for BPF
Entries in the secclass_map are expexted to be null terminated. The BPF entry was added without the NULL terminating and incosistent formatting. This patch cleans that up.
--- security/selinux/include/classmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/selinux/include/classmap.h +1 -1
@@ -239,7 +239,7 @@ struct security_class_mapping secclass_map[] = { {"infiniband_endport" , { "manage_subnet", NULL } }, {"bpf" , - {"map_create", "map_read", "map_write", "prog_load", "prog_run"} }, + { "map_create", "map_read", "map_write", "prog_load", "prog_run", NULL } }, { "xdp_socket", { COMMON_SOCK_PERMS, NULL } }, { NULL }
Signature · 1 line
2.20.1
Quoted 3 lines · William A. Kennington III
Entries in the
secclass_mapare expexted to be null terminated. The BPF entry was added without the NULL terminating and incosistent formatting. This patch cleans that up.
Thanks. A few minor nits:
A couple of spelling errors above (expected, inconsistent). Also, per Documentation/process/submitting-patches.rst, rather than say "This patch cleans that up", say "Clean that up" or similar.
Can add a:
Quoted 11 lines
Signed-off-by William A. Kennington III <[email protected]>--- security/selinux/include/classmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)security/selinux/include/classmap.h +0
-0
security/selinux/include/classmap.h struct security_class_mapping secclass_map[] = { · line 242
Quoted 5 lines
security/selinux/include/classmap.h +1
-1@@ -239,7 +239,7 @@ struct security_class_mapping secclass_map[] = { {"infiniband_endport" , { "manage_subnet", NULL } }, {"bpf" , - {"map_create", "map_read", "map_write", "prog_load", "prog_run"} }, + { "map_create", "map_read", "map_write", "prog_load", "prog_run", NULL } },
Should likely break the line to make checkpatch.pl happy:
$ ./scripts/checkpatch.pl -g HEAD
WARNING: line over 80 characters
#24: FILE: security/selinux/include/classmap.h:242:
+ { "map_create", "map_read", "map_write", "prog_load", "prog_run", NULL } },Quoted 4 lines
security/selinux/include/classmap.h +0
-0{"xdp_socket" , { COMMON_SOCK_PERMS, NULL } }, { NULL }
Quoted 11 lines · Stephen Smalley
Quoted 3 lines · William A. Kennington III
Entries in the
secclass_mapare expexted to be null terminated. The BPF entry was added without the NULL terminating and incosistent formatting. This patch cleans that up.Thanks. A few minor nits:
A couple of spelling errors above (expected, inconsistent). Also, per
Documentation/process/submitting-patches.rst, rather than say "This patch cleans that up", say "Clean that up" or similar.Can add a:
Fixes ec27c3568a34c7f ("selinux: bpf: Add selinux check for eBPF syscall operations")
Although I guess there isn't really a bug here; this is just a consistency / style issue. secclass_map[] is defined as:
struct security_class_mapping {
const char *name;
const char *perms[sizeof(u32) * 8 + 1];
};struct security_class_mapping secclass_map[];
So even if you were to omit the terminating NULL from each permission list, any remaining slots in the perms array should be initialized to NULL automatically. We only truly need the explicit NULL terminator to end the class list.
Quoted 34 lines
Quoted 12 lines
Signed-off-by William A. Kennington III <[email protected]>---
security/selinux/include/classmap.h| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)security/selinux/include/classmap.h +0
-0security/selinux/include/classmap.h struct security_class_mapping secclass_map[] = { · line 244
Quoted 7 lines
security/selinux/include/classmap.h +1
-1@@ -239,7 +239,7 @@ struct security_class_mapping secclass_map[] = { { "infiniband_endport", { "manage_subnet", NULL } }, { "bpf", - {"map_create", "map_read", "map_write", "prog_load", "prog_run"} }, + { "map_create", "map_read", "map_write", "prog_load", "prog_run", NULL } },Should likely break the line to make checkpatch.pl happy:
$ ./scripts/checkpatch.pl -g HEAD WARNING: line over 80 characters #24: FILE: security/selinux/include/classmap.h:242: + { "map_create", "map_read", "map_write", "prog_load", "prog_run", NULL } },Quoted 4 lines
security/selinux/include/classmap.h +0
-0{ "xdp_socket",{
COMMON_SOCK_PERMS, NULL } },
{ NULL }
Paul Moore
maintainerQuoted 24 lines · Stephen Smalley
Quoted 7 lines · Stephen Smalley
Quoted 3 lines · William A. Kennington III
Entries in the
secclass_mapare expexted to be null terminated. The BPF entry was added without the NULL terminating and incosistent formatting. This patch cleans that up.Thanks. A few minor nits:
Quoted 7 lines
A couple of spelling errors above (expected, inconsistent). Also, per
Documentation/process/submitting-patches.rst, rather than say "This patch cleans that up", say "Clean that up" or similar.Can add a:
Fixes ec27c3568a34c7f ("selinux: bpf: Add selinux check for eBPFsyscall operations")
Although I guess there isn't really a bug here; this is just a consistency / style issue. secclass_map[] is defined as:
struct security_class_mapping { const char *name; const char *perms[sizeof(u32) * 8 + 1]; };
Quoted 6 lines
struct
security_class_mappingsecclass_map[];So even if you were to omit the terminating NULL from each permission list, any remaining slots in the perms array should be initialized to NULL automatically. We only truly need the explicit NULL terminator to end the class list.
To clarify this William, if you can make the changes that Stephen suggested I think this is still a worthwhile patch, even if it doesn't really fix a bug in the code. I would add some comments in the patch description indicating that this is more about consistency than fixing an error.
Signature · 2 lines
paul moore www.paul-moore.com