]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
bpf: fix check_map_access smin_value test when pointer contains offset
authorDaniel Borkmann <daniel@iogearbox.net>
Wed, 3 Apr 2019 18:39:11 +0000 (18:39 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 20 Apr 2019 07:15:09 +0000 (09:15 +0200)
commit4b756d9f7929f035e4e18cfa36124d9ae6b49cdf
treeb7d0958abe0adbcecbba1403a4cb23f25e0a3a1f
parent17efa65350c5a251ba7d90a56abc65205a204a03
bpf: fix check_map_access smin_value test when pointer contains offset

commit b7137c4eab85c1cf3d46acdde90ce1163b28c873 upstream.

In check_map_access() we probe actual bounds through __check_map_access()
with offset of reg->smin_value + off for lower bound and offset of
reg->umax_value + off for the upper bound. However, even though the
reg->smin_value could have a negative value, the final result of the
sum with off could be positive when pointer arithmetic with known and
unknown scalars is combined. In this case we reject the program with
an error such as "R<x> min value is negative, either use unsigned index
or do a if (index >=0) check." even though the access itself would be
fine. Therefore extend the check to probe whether the actual resulting
reg->smin_value + off is less than zero.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
[backported to 4.14 sblbir]
Signed-off-by: Balbir Singh <sblbir@amzn.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/bpf/verifier.c