| Message ID | 20210121020856.25507-1-bianpan2016@163.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 524db191d2f568a75dac27391865e3674e3f3d6c |
| Delegated to: | BPF |
| Headers | show |
| Series | bpf: put file handler if no storage found | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hello: This patch was applied to bpf/bpf.git (refs/heads/master): On Wed, 20 Jan 2021 18:08:56 -0800 you wrote: > Put file f if inode_storage_ptr() returns NULL. > > Fixes: 8ea636848aca ("bpf: Implement bpf_local_storage for inodes") > Acked-by: KP Singh <kpsingh@kernel.org> > Signed-off-by: Pan Bian <bianpan2016@163.com> > --- > kernel/bpf/bpf_inode_storage.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Here is the summary with links: - bpf: put file handler if no storage found https://git.kernel.org/bpf/bpf/c/524db191d2f5 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/kernel/bpf/bpf_inode_storage.c b/kernel/bpf/bpf_inode_storage.c index 6edff97ad594..089d5071d4fc 100644 --- a/kernel/bpf/bpf_inode_storage.c +++ b/kernel/bpf/bpf_inode_storage.c @@ -125,8 +125,12 @@ static int bpf_fd_inode_storage_update_elem(struct bpf_map *map, void *key, fd = *(int *)key; f = fget_raw(fd); - if (!f || !inode_storage_ptr(f->f_inode)) + if (!f) + return -EBADF; + if (!inode_storage_ptr(f->f_inode)) { + fput(f); return -EBADF; + } sdata = bpf_local_storage_update(f->f_inode, (struct bpf_local_storage_map *)map,
Put file f if inode_storage_ptr() returns NULL. Fixes: 8ea636848aca ("bpf: Implement bpf_local_storage for inodes") Acked-by: KP Singh <kpsingh@kernel.org> Signed-off-by: Pan Bian <bianpan2016@163.com> --- kernel/bpf/bpf_inode_storage.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)