From patchwork Wed Apr 3 22:17:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel T. Lee" X-Patchwork-Id: 1076507 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lzys0qo3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44ZL7P04xtz9sSS for ; Thu, 4 Apr 2019 09:18:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726419AbfDCWSH (ORCPT ); Wed, 3 Apr 2019 18:18:07 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:34320 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726199AbfDCWSG (ORCPT ); Wed, 3 Apr 2019 18:18:06 -0400 Received: by mail-pf1-f195.google.com with SMTP id b3so284532pfd.1 for ; Wed, 03 Apr 2019 15:18:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=guBPD8RIwqO6Ne5jT+2LXDvS7Wb6eBN+wTROO4mt7Io=; b=lzys0qo3GQSjRqQ0J3k5uL6iWVMs9/InSJU9JkBPK9pOYaEp4ct+Xebb0Ch8dzfjSG ekvhDsBR5WwtZEYmq8tyrJWVqGzC5EJgzQPw0y098gAgfpd0UwpR40oDN4W5JNmuoLAE sjapj3zgApjj65RrTwJeL3h4alRIUOCPYWEje1xrwIM5uPIVHUoXoshDnAXosDwKVSxL mmSPjUAQFdDa5M6Z6wn9vmLlQfeE4xPYF/kCJkhwjBdLey5BPzf/BB9OmZ6kj52SzNHl 0zBCY2Jkvw3dBwXYQx+hQlovWjJsL+UBthISLo4aU7dVR7bP1IYdlmpfZ3pkVaevQut3 CnyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=guBPD8RIwqO6Ne5jT+2LXDvS7Wb6eBN+wTROO4mt7Io=; b=Z7WbPS0fMHCJ15HROisN1gvP7wBpM3IF46qqn9+wl60QdOv29Hf2+7UXt6oGzrjuIQ 7fX/OQplPq2/9xGBEUK/B40XqexulRUb8VbtkNUAMynCyXd1TA1OoZfFUEnHkJitjNxm g0t+ghV7tSkeQR22uRUnweWM47HC7OgQxpIYJ0hc82TrN311yvFcVhSpR6YUy9WsUYZq vlxu93MSXqKc1MKRBIqpPjF/X+Ekmrn32aC7JcBc9YnkG06mkxhhZJPC7oLkbGZbSDrI DD3D5v7ogPb33rGee4WNZHpjZNODedcDpKqkLZQ5UoSxH25xV9RbWc/ntgBVbtvbq13M uXkA== X-Gm-Message-State: APjAAAWdJiSST8OZ9Zxlg0xx3LDLmVTWNmdp5B+gMJplONaygi3o2YFy pLHfG7iWdKPhRKnqvkS9Ig== X-Google-Smtp-Source: APXvYqyN1HA/gM+tH6wqfTA3U61fTCWR60Duesdcln5OnjBX2MXPxvxIGVTFqvSH/XOsnNvJ15bEXw== X-Received: by 2002:a63:720e:: with SMTP id n14mr2121152pgc.93.1554329885841; Wed, 03 Apr 2019 15:18:05 -0700 (PDT) Received: from localhost.localdomain ([114.71.48.5]) by smtp.gmail.com with ESMTPSA id d3sm26056314pfn.113.2019.04.03.15.18.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 15:18:05 -0700 (PDT) From: "Daniel T. Lee" To: Daniel Borkmann , Alexei Starovoitov Cc: netdev@vger.kernel.org Subject: [PATCH v3 2/2] samples, selftests/bpf: add NULL check for ksym_search Date: Thu, 4 Apr 2019 07:17:56 +0900 Message-Id: <20190403221756.23095-2-danieltimlee@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190403221756.23095-1-danieltimlee@gmail.com> References: <20190403221756.23095-1-danieltimlee@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since, ksym_search added with verification logic for symbols existence, it could return NULL when the kernel symbols are not loaded. This commit will add NULL check logic after ksym_search. Signed-off-by: Daniel T. Lee --- Changes in v3: - Added NULL check for samples/spintest_user.c Changes in v2: - Added NULL check for selftests/bpf/prog_tests/get_stack_raw_tp.c samples/bpf/offwaketime_user.c | 5 +++++ samples/bpf/sampleip_user.c | 5 +++++ samples/bpf/spintest_user.c | 7 ++++++- samples/bpf/trace_event_user.c | 5 +++++ tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c | 4 ++-- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/samples/bpf/offwaketime_user.c b/samples/bpf/offwaketime_user.c index f06063af9fcb..bb315ce1b866 100644 --- a/samples/bpf/offwaketime_user.c +++ b/samples/bpf/offwaketime_user.c @@ -28,6 +28,11 @@ static void print_ksym(__u64 addr) if (!addr) return; sym = ksym_search(addr); + if (!sym) { + printf("ksym not found. Is kallsyms loaded?\n"); + return; + } + if (PRINT_RAW_ADDR) printf("%s/%llx;", sym->name, addr); else diff --git a/samples/bpf/sampleip_user.c b/samples/bpf/sampleip_user.c index 216c7ecbbbe9..23b90a45c802 100644 --- a/samples/bpf/sampleip_user.c +++ b/samples/bpf/sampleip_user.c @@ -109,6 +109,11 @@ static void print_ip_map(int fd) for (i = 0; i < max; i++) { if (counts[i].ip > PAGE_OFFSET) { sym = ksym_search(counts[i].ip); + if (!sym) { + printf("ksym not found. Is kallsyms loaded?\n"); + continue; + } + printf("0x%-17llx %-32s %u\n", counts[i].ip, sym->name, counts[i].count); } else { diff --git a/samples/bpf/spintest_user.c b/samples/bpf/spintest_user.c index 8d3e9cfa1909..2556af2d9b3e 100644 --- a/samples/bpf/spintest_user.c +++ b/samples/bpf/spintest_user.c @@ -37,8 +37,13 @@ int main(int ac, char **argv) bpf_map_lookup_elem(map_fd[0], &next_key, &value); assert(next_key == value); sym = ksym_search(value); - printf(" %s", sym->name); key = next_key; + if (!sym) { + printf("ksym not found. Is kallsyms loaded?\n"); + continue; + } + + printf(" %s", sym->name); } if (key) printf("\n"); diff --git a/samples/bpf/trace_event_user.c b/samples/bpf/trace_event_user.c index d08046ab81f0..d4178f60e075 100644 --- a/samples/bpf/trace_event_user.c +++ b/samples/bpf/trace_event_user.c @@ -34,6 +34,11 @@ static void print_ksym(__u64 addr) if (!addr) return; sym = ksym_search(addr); + if (!sym) { + printf("ksym not found. Is kallsyms loaded?\n"); + return; + } + printf("%s;", sym->name); if (!strcmp(sym->name, "sys_read")) sys_read_seen = true; diff --git a/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c b/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c index d7bb5beb1c57..c2a0a9d5591b 100644 --- a/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c +++ b/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c @@ -39,7 +39,7 @@ static int get_stack_print_output(void *data, int size) } else { for (i = 0; i < num_stack; i++) { ks = ksym_search(raw_data[i]); - if (strcmp(ks->name, nonjit_func) == 0) { + if (ks && (strcmp(ks->name, nonjit_func) == 0)) { found = true; break; } @@ -56,7 +56,7 @@ static int get_stack_print_output(void *data, int size) } else { for (i = 0; i < num_stack; i++) { ks = ksym_search(e->kern_stack[i]); - if (strcmp(ks->name, nonjit_func) == 0) { + if (ks && (strcmp(ks->name, nonjit_func) == 0)) { good_kern_stack = true; break; }