Patch "bpf: Fix a verifier verbose message" has been added to the 5.15-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    bpf: Fix a verifier verbose message

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     bpf-fix-a-verifier-verbose-message.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 4901a9cd76763806fedc35f8c5821cf397195aab
Author: Anton Protopopov <aspsk@xxxxxxxxxxxxx>
Date:   Fri Apr 12 16:11:00 2024 +0200

    bpf: Fix a verifier verbose message
    
    [ Upstream commit 37eacb9f6e89fb399a79e952bc9c78eb3e16290e ]
    
    Long ago a map file descriptor in a pseudo ldimm64 instruction could
    only be present as an immediate value insn[0].imm, and thus this value
    was used in a verbose verifier message printed when the file descriptor
    wasn't valid. Since addition of BPF_PSEUDO_MAP_IDX_VALUE/BPF_PSEUDO_MAP_IDX
    the insn[0].imm field can also contain an index pointing to the file
    descriptor in the attr.fd_array array. However, if the file descriptor
    is invalid, the verifier still prints the verbose message containing
    value of insn[0].imm. Patch the verifier message to always print the
    actual file descriptor value.
    
    Fixes: 387544bfa291 ("bpf: Introduce fd_idx")
    Signed-off-by: Anton Protopopov <aspsk@xxxxxxxxxxxxx>
    Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
    Acked-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/bpf/20240412141100.3562942-1-aspsk@xxxxxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 67b3254270221..94d952967fbf9 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -11875,8 +11875,7 @@ static int resolve_pseudo_ldimm64(struct bpf_verifier_env *env)
 			f = fdget(fd);
 			map = __bpf_map_get(f);
 			if (IS_ERR(map)) {
-				verbose(env, "fd %d is not pointing to valid bpf_map\n",
-					insn[0].imm);
+				verbose(env, "fd %d is not pointing to valid bpf_map\n", fd);
 				return PTR_ERR(map);
 			}
 




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux