mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 09:12:07 +00:00
selinux: reject invalid ebitmaps
Reject ebitmaps with a node containing an empty map or with an incorrect highbit. Both checks are already performed by userspace, the former since 2008 (patch 13cd4c896068 ("initial import from svn trunk revision 2950")), the latter since v2.7 in 2017 (patch 75b14a5de10a ("libsepol: ebitmap: reject loading bitmaps with incorrect high bit")). Signed-off-by: Christian Göttsche <cgzones@googlemail.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
parent
4cece76496
commit
0142c56682
@ -448,6 +448,10 @@ int ebitmap_read(struct ebitmap *e, void *fp)
|
||||
goto bad;
|
||||
}
|
||||
map = le64_to_cpu(mapbits);
|
||||
if (!map) {
|
||||
pr_err("SELinux: ebitmap: empty map\n");
|
||||
goto bad;
|
||||
}
|
||||
|
||||
index = (startbit - n->startbit) / EBITMAP_UNIT_SIZE;
|
||||
while (map) {
|
||||
@ -455,6 +459,13 @@ int ebitmap_read(struct ebitmap *e, void *fp)
|
||||
map = EBITMAP_SHIFT_UNIT_SIZE(map);
|
||||
}
|
||||
}
|
||||
|
||||
if (n && n->startbit + EBITMAP_SIZE != e->highbit) {
|
||||
pr_err("SELinux: ebitmap: high bit %d is not equal to the expected value %ld\n",
|
||||
e->highbit, n->startbit + EBITMAP_SIZE);
|
||||
goto bad;
|
||||
}
|
||||
|
||||
ok:
|
||||
rc = 0;
|
||||
out:
|
||||
|
Loading…
Reference in New Issue
Block a user