Merge branch 'core/urgent' into x86/urgent, to pick up objtool fix

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 0 deletions

diff --git a/kernel/bpf/queue_stack_maps.c b/kernel/bpf/queue_stack_maps.c
index 12a93fb37449..8bbd72d3a121 100644
--- a/kernel/bpf/queue_stack_maps.c
+++ b/kernel/bpf/queue_stack_maps.c
@@ -122,6 +122,7 @@ static int __queue_map_get(struct bpf_map *map, void *value, bool delete)
         raw_spin_lock_irqsave(&qs->lock, flags);
 
         if (queue_stack_map_is_empty(qs)) {
+                memset(value, 0, qs->map.value_size);
                 err = -ENOENT;
                 goto out;
         }
@@ -151,6 +152,7 @@ static int __stack_map_get(struct bpf_map *map, void *value, bool delete)
         raw_spin_lock_irqsave(&qs->lock, flags);
 
         if (queue_stack_map_is_empty(qs)) {
+                memset(value, 0, qs->map.value_size);
                 err = -ENOENT;
                 goto out;
         }