History

bpf: refine kernel.unprivileged_bpf_disabled behaviour

With unprivileged BPF disabled, all cmds associated with the BPF syscall are blocked to users without CAP_BPF/CAP_SYS_ADMIN. However there are use cases where we may wish to allow interactions with BPF programs without being able to load and attach them. So for example, a process with required capabilities loads/attaches a BPF program, and a process with less capabilities interacts with it; retrieving perf/ring buffer events, modifying map-specified config etc. With all BPF syscall commands blocked as a result of unprivileged BPF being disabled, this mode of interaction becomes impossible for processes without CAP_BPF. As Alexei notes "The bpf ACL model is the same as traditional file's ACL. The creds and ACLs are checked at open(). Then during file's write/read additional checks might be performed. BPF has such functionality already. Different map_creates have capability checks while map_lookup has: map_get_sys_perms(map, f) & FMODE_CAN_READ. In other words it's enough to gate FD-receiving parts of bpf with unprivileged_bpf_disabled sysctl. The rest is handled by availability of FD and access to files in bpffs." So key fd creation syscall commands BPF_PROG_LOAD and BPF_MAP_CREATE are blocked with unprivileged BPF disabled and no CAP_BPF. And as Alexei notes, map creation with unprivileged BPF disabled off blocks creation of maps aside from array, hash and ringbuf maps. Programs responsible for loading and attaching the BPF program can still control access to its pinned representation by restricting permissions on the pin path, as with normal files.

Alan Maguire committed 4 years ago

Commit c8644cd1 parent 97949761 file · +13 −1Browse files

Unified · Split

kernel/bpf/syscall.c+13−1
@@ -4863,9 +4863,21 @@ out_prog_put: · 4862 unmodified lines
48634863 static int __sys_bpf(int cmd, bpfptr_t uattr, unsigned int size)
48644864 {
48654865 union bpf_attr attr;
4866+ bool capable;
48664867 int err;
48674868
4868− if (sysctl_unprivileged_bpf_disabled && !bpf_capable())
4869+ capable = bpf_capable() || !sysctl_unprivileged_bpf_disabled;
4870+
4871+ /* Intent here is for unprivileged_bpf_disabled to block key object
4872+ * creation commands for unprivileged users; other actions depend
4873+ * of fd availability and access to bpffs, so are dependent on
4874+ * object creation success. Capabilities are later verified for
4875+ * operations such as load and map create, so even with unprivileged
4876+ * BPF disabled, capability checks are still carried out for these
4877+ * and other operations.
4878+ */
4879+ if (!capable &&
4880+ (cmd == BPF_MAP_CREATE || cmd == BPF_PROG_LOAD))
48694881 return -EPERM;
48704882
48714883 err = bpf_check_uarg_tail_zero(uattr, sizeof(attr), size);