From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D68FBC41514 for ; Sat, 31 Aug 2019 02:34:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAA6223697 for ; Sat, 31 Aug 2019 02:34:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RpYhA35a" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728334AbfHaCea (ORCPT ); Fri, 30 Aug 2019 22:34:30 -0400 Received: from mail-yw1-f73.google.com ([209.85.161.73]:35661 "EHLO mail-yw1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728309AbfHaCea (ORCPT ); Fri, 30 Aug 2019 22:34:30 -0400 Received: by mail-yw1-f73.google.com with SMTP id k21so6710896ywk.2 for ; Fri, 30 Aug 2019 19:34:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=o06HkPxIPXx8Sc900nvKiFOh9246i19O7yDA5ZbcmgE=; b=RpYhA35aCeSSt096Ky2o5pdBBcCpGYs4CyV+IcPegOIJ+wmXpAbw1WMiOQ79B2Kplj sq2aJJJVhLBFkzRi6mRvjIAYY72MmhL+ufI5k1pqvlz6cxNrluNMD9vY8WaE1zB0/NHQ FCc8cry9davbl0fUGKcuPuLMTKZrvkrCP7r+ywvah9hyhV/CylL15nb8wN5dzwMFI1ct Sm5D6RY7dKtpTxZZ85HrFyyAf0uEbqHgzgPqAZr3qxxefeHvTpK/MU3CNsjL42N8c/IC mE6tAfDsLWwFdQO2zI8NrLdHEkm/vmSbCK2gLAClV+MhhVdAMmwvvYYaZaJ/G+8E8KNX Hq7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=o06HkPxIPXx8Sc900nvKiFOh9246i19O7yDA5ZbcmgE=; b=pOmEyCZlJiNVGCmL6/eoHaUCumLb7l/Pr48hX52eRKUCzCA+F+UDBxbKjfDu3oyQ0C grzbZUCbJvoPWhQiR0zVkicCWWn5WBsbaJrJ9wUJFbLZ04GRyTMiwT445Bzmmw+Zqf+F tkCX/l+XcMzyI0necaW12v2MbNl0/AG7/RcUlTu1693fBlwQuNRlx7A+N0eS9b8C5t7z KNUICp0gtjtD1iVgc2l7GFUkiJQQTe/qecFjE7ro5U7coI57raBY5SbCn0aFEiaiKJQM +MEsr6udjZaMj1fgy+Ylo5p1CXQltkf8YIJA10l0YBIQY0OSuIIQ2qKuqERm+unyEUwl wF7g== X-Gm-Message-State: APjAAAWYz2l4630SX5G3NiQ6Bomu/pNjDKOM3VgLR2YV2vd3N9XdBjAW dQZqSJ2EGIYVF+PEU67bIPFvofsK56pBcg3DoYy/yanfQANXl6siXQWD/BswCPEu9JUCfhYi+jO FBsDhzzFa5JAWLqHndzGgaPbTeb1XCiIgi8+opvisDLB+yL56lvoUGQ== X-Google-Smtp-Source: APXvYqzf7QvbOER6Pdtj2E1hKd74VR9u2nJPawUxC4mJhMzOvVrjnsXYTyJFzFaQKJYi3IcHdhpkxeM= X-Received: by 2002:a81:9917:: with SMTP id q23mr14340518ywg.312.1567218869396; Fri, 30 Aug 2019 19:34:29 -0700 (PDT) Date: Fri, 30 Aug 2019 19:34:26 -0700 Message-Id: <20190831023427.239820-1-sdf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog Subject: [PATCH bpf-next 1/2] selftests/bpf: test_progs: fix verbose mode garbage From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org fseeko(.., 0, SEEK_SET) on a memstream just puts the buffer pointer to the beginning so when we call fflush on it we get some garbage log data from the previous test. Let's manually set terminating byte to zero at the reported buffer size. To show the issue consider the following snippet: stream = open_memstream (&buf, &len); fprintf(stream, "aaa"); fflush(stream); printf("buf=%s, len=%zu\n", buf, len); fseeko(stream, 0, SEEK_SET); fprintf(stream, "b"); fflush(stream); printf("buf=%s, len=%zu\n", buf, len); Output: buf=aaa, len=3 buf=baa, len=1 Fixes: 946152b3c5d6 ("selftests/bpf: test_progs: switch to open_memstream") Signed-off-by: Stanislav Fomichev --- tools/testing/selftests/bpf/test_progs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index e5892cb60eca..e8616e778cb5 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -45,6 +45,7 @@ static void dump_test_log(const struct prog_test_def *test, bool failed) if (env.verbose || test->force_log || failed) { if (env.log_cnt) { + env.log_buf[env.log_cnt] = '\0'; fprintf(env.stdout, "%s", env.log_buf); if (env.log_buf[env.log_cnt - 1] != '\n') fprintf(env.stdout, "\n"); -- 2.23.0.187.g17f5b7556c-goog