From patchwork Tue Jan 15 22:54:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1025532 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="g4KttRL9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fQdr5vSMz9sD4 for ; Wed, 16 Jan 2019 09:54:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391292AbfAOWyz (ORCPT ); Tue, 15 Jan 2019 17:54:55 -0500 Received: from mail-ot1-f73.google.com ([209.85.210.73]:33017 "EHLO mail-ot1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391269AbfAOWyy (ORCPT ); Tue, 15 Jan 2019 17:54:54 -0500 Received: by mail-ot1-f73.google.com with SMTP id r15so1740446ota.0 for ; Tue, 15 Jan 2019 14:54:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=yDJ/L6vBqpvGKdilXSKNogIcmuYewwcsCdqhrppxecw=; b=g4KttRL9eKp+0Q4uBHRILcbC8i/HpQmJ3NlLa7N8NQsPw9yDE3EeoCfMtAWYjpqIkp xph5dJV094ZOr+xhLdq8BWJUz2Itueba8BYJhDqhUVal3Twu3/o9gjPqZvw/FeBhJ9J6 bNxWku5FE4wxrIDzUhxUOfdppYijZjkjNCazmnxxHVUhDu/Y51vcNWeMO/5C73GWS7Eu GnMjmSi3oZ5bP5bMGxa9XL1VPpGggORXM3pQTUsSmMAW+ZfNjo5YejI1GDJ1tb/LrsD+ CzcfKHQrI2OZXaF4HcDnMcmJaCBBonVosrbF7MXU3x5ZhI//ObxP52aY6ygazleEWYX7 WA+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=yDJ/L6vBqpvGKdilXSKNogIcmuYewwcsCdqhrppxecw=; b=EO63hgcqjMbZs4WKAgv0atLgByuwTnXX6fjgYLGTR3fKX9wru3Rdw/Qw2mxdlhslLK j0D6EEPFP0+OXuleyzXC1s7b9uGJTo69JY4m9GFn8Pc20z37phrovNoRMFLQz2iiU/2x zRvK89YUMU1uuGPjGlMgfQVqtM8R3xJsiIOAu0b2t5raWW874AQPcFwQPNXFLUuX0amz QV+GAj4V2SS9MWtvxNnpYNb0Jo84znT48Pdi7LE7UA6/6JuB6AasDsHJCKHC3uAsK8Vs 7JaZWcqvsjfslvTcigaEp3mWZQsYq0bKRzt1HhGLDrkvPwtE+oh2xudmlQJpHMTbTgA3 gV+w== X-Gm-Message-State: AJcUukef0IZ928Le9/NamqpBLPIg97XzWCS3Kw/dS/ZhmxIzyW1smaBr 6uXdlJSJsoxjXPW9Q4XXogN7iq+dN3V8tptL/m8C5kUdogsKZu3POo3eoeGoXW4Lw0g+offPA/t ZUb5F71SHDKJxgKoN3wMEkw/dii9FXRNqUTOIIHStmFIwLEVOJdePVg== X-Google-Smtp-Source: ALg8bN6l+pCGxGnKFlRk4te5h/QiSLSugGCS9ccANiNNsPVhbzvt3U/DSzp5tw+uv4VwY2iEpbX92ec= X-Received: by 2002:a05:6830:200f:: with SMTP id e15mr3503064otp.61.1547592893525; Tue, 15 Jan 2019 14:54:53 -0800 (PST) Date: Tue, 15 Jan 2019 14:54:46 -0800 In-Reply-To: <20190115225447.245788-1-sdf@google.com> Message-Id: <20190115225447.245788-2-sdf@google.com> Mime-Version: 1.0 References: <20190115225447.245788-1-sdf@google.com> X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog Subject: [PATCH bpf 2/3] bpf: zero out build_id for BPF_STACK_BUILD_ID_IP From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, songliubraving@fb.com, Stanislav Fomichev Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When returning BPF_STACK_BUILD_ID_IP from stack_map_get_build_id_offset, make sure that build_id field is empty. Since we are using percpu free list, there is a possibility that we might reuse some previous bpf_stack_build_id with non-zero build_id. Fixes: 615755a77b24 ("bpf: extend stackmap to save binary_build_id+offset instead of address") Signed-off-by: Stanislav Fomichev Acked-by: Song Liu --- kernel/bpf/stackmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c index 8975d1768dcb..f4b57c68c45f 100644 --- a/kernel/bpf/stackmap.c +++ b/kernel/bpf/stackmap.c @@ -315,6 +315,7 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs, for (i = 0; i < trace_nr; i++) { id_offs[i].status = BPF_STACK_BUILD_ID_IP; id_offs[i].ip = ips[i]; + memset(id_offs[i].build_id, 0, BPF_BUILD_ID_SIZE); } return; } @@ -325,6 +326,7 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs, /* per entry fall back to ips */ id_offs[i].status = BPF_STACK_BUILD_ID_IP; id_offs[i].ip = ips[i]; + memset(id_offs[i].build_id, 0, BPF_BUILD_ID_SIZE); continue; } id_offs[i].offset = (vma->vm_pgoff << PAGE_SHIFT) + ips[i]