• Will Deacon's avatar
    bpf: Fix mask generation for 32-bit narrow loads of 64-bit fields · 0613d8ca
    Will Deacon authored
    A narrow load from a 64-bit context field results in a 64-bit load
    followed potentially by a 64-bit right-shift and then a bitwise AND
    operation to extract the relevant data.
    
    In the case of a 32-bit access, an immediate mask of 0xffffffff is used
    to construct a 64-bit BPP_AND operation which then sign-extends the mask
    value and effectively acts as a glorified no-op. For example:
    
    0:	61 10 00 00 00 00 00 00	r0 = *(u32 *)(r1 + 0)
    
    results in the following code generation for a 64-bit field:
    
    	ldr	x7, [x7]	// 64-bit load
    	mov	x10, #0xffffffffffffffff
    	and	x7, x7, x10
    
    Fix the mask generation so that narrow loads always perform a 32-bit AND
    operation:
    
    	ldr	x7, [x7]	// 64-bit load
    	mov	w10, #0xffffffff
    	and	w7, w7, w10
    
    Cc: Alexei Starovoitov <ast@kernel.org>
    Cc: Daniel Borkmann <daniel@iogearbox.net>
    Cc: John Fastabend <john.fastabend@gmail.com>
    Cc: Krzesimir Nowak <krzesimir@kinvolk.io>
    Cc: Andrey Ignatov <rdna@fb.com>
    Acked-by: default avatarYonghong Song <yhs@fb.com>
    Fixes: 31fd8581 ("bpf: permits narrower load from bpf program context fields")
    Signed-off-by: default avatarWill Deacon <will@kernel.org>
    Link: https://lore.kernel.org/r/20230518102528.1341-1-will@kernel.orgSigned-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
    0613d8ca
verifier.c 555 KB