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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 55C20C28CC0 for ; Wed, 29 May 2019 13:38:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2BEE322580 for ; Wed, 29 May 2019 13:38:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559137131; bh=Bxy2QVAtD7OaR3LKJOHeKWFTimcRVCQlVjaAlgRHHcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MpBxTRo4gUPpWoC+HrlSJZet1Ii83aoJdlAqWjMlBFdKaKEMBXD4r+KW3w8ycye42 pPUu3zxYsIMJvWYrT1MQIrQKDWb13qdKS7eg7JlS9207Z/Vxhf+p1EHX7QLpYVh6DX WSFEXN2Km3dhmcRwEqwBuB4uab9bpmGdOultkDUY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727736AbfE2Niu (ORCPT ); Wed, 29 May 2019 09:38:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:54650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726863AbfE2Nit (ORCPT ); Wed, 29 May 2019 09:38:49 -0400 Received: from quaco.ghostprotocols.net (unknown [177.195.211.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 81E7A2253D; Wed, 29 May 2019 13:38:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559137129; bh=Bxy2QVAtD7OaR3LKJOHeKWFTimcRVCQlVjaAlgRHHcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b0qReqiv3vVuJg8SDut6JLdz0HockBQImZFuedk+ir3SLiZ834UFvGFczJKRaF7vO L3XV0ngTcJCN4GX8pUuSHiE28fKZLkPS25wwPC7G0GypA0g212vh470OtO0n3DDCSB 4O0SLZx7RvP//Iq2MGPbCVYEH3/aKuJJxKixKrh0= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Donald Yandt , Alexander Shishkin , Jiri Olsa , Peter Zijlstra , Yanmin Zhang , Arnaldo Carvalho de Melo Subject: [PATCH 31/41] perf machine: Return NULL instead of null-terminating /proc/version array Date: Wed, 29 May 2019 10:35:55 -0300 Message-Id: <20190529133605.21118-32-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190529133605.21118-1-acme@kernel.org> References: <20190529133605.21118-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Donald Yandt Return NULL instead of null-terminating version char array when fgets fails due to end-of-file or error. Signed-off-by: Donald Yandt Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Yanmin Zhang Fixes: 30ba5b0e66c8 ("perf machine: Null-terminate version char array upon fgets(/proc/version) error") Link: http://lkml.kernel.org/r/20190528134128.30841-1-donald.yandt@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/machine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index f5569f005cf3..17eec39e775e 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1241,9 +1241,9 @@ static char *get_kernel_version(const char *root_dir) return NULL; tmp = fgets(version, sizeof(version), file); - if (!tmp) - *version = '\0'; fclose(file); + if (!tmp) + return NULL; name = strstr(version, prefix); if (!name) -- 2.20.1