From patchwork Mon Apr 26 07:29:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 427527 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6d12:0:0:0:0 with SMTP id m18csp3588108ejr; Mon, 26 Apr 2021 00:44:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBVMpAm09RNhoCuHJFVlJDGalK+xZbhiQQbWESQo4sjN9qTHeRGx/TuqKsUTYWZafuTJBN X-Received: by 2002:a62:e80f:0:b029:263:951f:14fb with SMTP id c15-20020a62e80f0000b0290263951f14fbmr16504578pfi.63.1619422981931; Mon, 26 Apr 2021 00:43:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619422981; cv=none; d=google.com; s=arc-20160816; b=l+olZSNfcHgf6fNoVWcJv5oUaVVoIW1A5gopK6xy8YAHzUjQxVeh1b02EvLAXKt7R1 CibMZoBUEVa39m/96QFhM0XoCJuG/Kap/Z5l4eDlz3E4mFdDjaBddxslWSfGxvtvyDkp v2AKndwkzGTiSwzKpUYCZfcD8+2xX3rHR9BdZDM/iNsZBkNvnpJfuyyh/SvZNc9EyIVe mli5k0Kf0T80lPv0tv4yQJQ5Wyk9QvTVc4OIBIT6LX2PhqwzTyg6anzSQL3Gn8MfFECz hrfk1UraCd+W0XZpyotkW0S3F1wOtjqJoVeTmaUE1no9Ey8uyx6LIfDVo2hmrreczj+/ AfLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AZYdwgZoJ8ayyCQFkm+ddX8m9kZmeMZ08ZxEms51PLE=; b=WK3YpU7/ccmd96Wefzweej3tMptqQQ6jyKB4VyUUsj+apiIdXcdvMNOXHpF4/QoOzi PFjz/urBl782h+7ogK5Fph/kJ4T4NRHAG9IwHqBbHw47zJl4NuRKod1usQN8EqGMU/Sg la2IohheXJ6YHXo+NNR2Ab2erSSjoFhq8vkxPU15+Vtv8dsxxh83WPlqeMJ/OjZMkiv5 y95/FxHIXvo2XMCP749rY8i4w0NwZ90e7N6jR9FZUrnuyuGZMeslvVZAMOpCRqPeabKZ +FtzpzIT02kq4SPICe5cLmo50qCuAuFAzkHi5hOtxVnvrYhfhsBO2fxVBjgroXTLtM9p r5Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ICO8mrDz; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u27si17120814pgl.205.2021.04.26.00.43.01; Mon, 26 Apr 2021 00:43:01 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ICO8mrDz; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232399AbhDZHnk (ORCPT + 12 others); Mon, 26 Apr 2021 03:43:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:56168 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233490AbhDZHlv (ORCPT ); Mon, 26 Apr 2021 03:41:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C294E61369; Mon, 26 Apr 2021 07:39:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619422759; bh=KVuSzgEWL8yOaClH1gfHCtSceNgJivoQJwjpO7bOolE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ICO8mrDzhTDuznEuT2WukxnuTewscXwj1c1oTtzI5H/hhrgtTVR8pSeJxigv7yIcX SM/nr2iDCTo5/0LEWbW68NA336D6Q6eDtoOZxM/WNd0EDlwDKKG2zPjeHIlHueCMv1 0LzT6+BSydTA4OJU+Fp5CdDa45pbnaxCKJtqx/mk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Alexander Shishkin , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.10 17/36] perf map: Fix error return code in maps__clone() Date: Mon, 26 Apr 2021 09:29:59 +0200 Message-Id: <20210426072819.370357445@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426072818.777662399@linuxfoundation.org> References: <20210426072818.777662399@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit c6f87141254d16e281e4b4431af7316895207b8f ] Although 'err' has been initialized to -ENOMEM, but it will be reassigned by the "err = unwind__prepare_access(...)" statement in the for loop. So that, the value of 'err' is unknown when map__clone() failed. Fixes: 6c502584438bda63 ("perf unwind: Call unwind__prepare_access for forked thread") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: zhen lei Link: http://lore.kernel.org/lkml/20210415092744.3793-1-thunder.leizhen@huawei.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/map.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index e2537d5acab0..f4d44f75ba15 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -836,15 +836,18 @@ out: int maps__clone(struct thread *thread, struct maps *parent) { struct maps *maps = thread->maps; - int err = -ENOMEM; + int err; struct map *map; down_read(&parent->lock); maps__for_each_entry(parent, map) { struct map *new = map__clone(map); - if (new == NULL) + + if (new == NULL) { + err = -ENOMEM; goto out_unlock; + } err = unwind__prepare_access(maps, new, NULL); if (err)