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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 736ACC64EC7 for ; Tue, 21 Feb 2023 16:45:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234590AbjBUQpK (ORCPT ); Tue, 21 Feb 2023 11:45:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235078AbjBUQpF (ORCPT ); Tue, 21 Feb 2023 11:45:05 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8EFC1BC8 for ; Tue, 21 Feb 2023 08:45:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676997904; x=1708533904; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=511FxfavKLa+zYcbLl4LtR0A/68N+zMevCnXerlbW5g=; b=lVH/zlvF6GvuYfutmSeA8XAGvBNkjLW1fPFMlF4h25aGpv3jIWTewEsO 5aDVjn4LrCraL20N7/UvY4ktLQmPNntYGOVzm5InS7Hjrzyl3tdc2Ks/e i3AJh0qbWJ4igkgP+DrjQFaWh+XugM+D8UKj7FP/AbRz92WDJ18JwSnLm S7UR8L14OnSNjnBdEDH4SH4UjRgG2TQMdGrx+wpdGmxrs/SHWXNmHiPyq mgZMz6YznYU/sOoVi9V8wzAxBljNFR+yyQoZoB15vSDTYw2IrvZr7lNDD VQMRz8JfCUIdDigAqe5PulYsTJD6gksvK9Dmu9nHd6QROp1vLqrqcIijU A==; X-IronPort-AV: E=McAfee;i="6500,9779,10628"; a="334880013" X-IronPort-AV: E=Sophos;i="5.97,315,1669104000"; d="scan'208";a="334880013" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2023 08:45:04 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10628"; a="845740832" X-IronPort-AV: E=Sophos;i="5.97,315,1669104000"; d="scan'208";a="845740832" Received: from djiang5-mobl3.amr.corp.intel.com (HELO [10.213.184.163]) ([10.213.184.163]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2023 08:45:03 -0800 Message-ID: <558347b8-2843-bed3-6544-5b0cd105a868@intel.com> Date: Tue, 21 Feb 2023 09:45:03 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.6.0 Subject: Re: [PATCH ndctl 2/3] cxl/monitor: retain error code in monitor_event() Content-Language: en-US To: Vishal Verma , linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, Dan Williams References: <20230217-coverity-fixes-v1-0-043fac896a40@intel.com> <20230217-coverity-fixes-v1-2-043fac896a40@intel.com> From: Dave Jiang In-Reply-To: <20230217-coverity-fixes-v1-2-043fac896a40@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org On 2/17/23 5:40 PM, Vishal Verma wrote: > Static analysis reports that the error unwinding path in monitor_event() > overwrites 'rc' with the return from cxl_event_tracing_disable(). This > masks the actual error code from either epoll_wait() or > cxl_parse_events() which is the one that should be propagated. > > Print a spot error in case there's an error while disabling tracing, but > otherwise retain the rc from the main body of the function. > > Fixes: 299f69f974a6 ("cxl/monitor: add a new monitor command for CXL trace events") > Cc: Dave Jiang > Cc: Dan Williams > Signed-off-by: Vishal Verma Reviewed-by: Dave Jiang > --- > cxl/monitor.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/cxl/monitor.c b/cxl/monitor.c > index 31e6f98..749f472 100644 > --- a/cxl/monitor.c > +++ b/cxl/monitor.c > @@ -130,7 +130,8 @@ static int monitor_event(struct cxl_ctx *ctx) > } > > parse_err: > - rc = cxl_event_tracing_disable(inst); > + if (cxl_event_tracing_disable(inst) < 0) > + err(&monitor, "failed to disable tracing\n"); > event_en_err: > epoll_ctl_err: > close(fd); >