Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2373457pxb; Mon, 12 Apr 2021 23:43:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyw7I1RwLfX1pnMDohdimN7ZfvyXUn4MkDHogiw1g0lUWi3eh9e4jX4Po68bpvc/5aO+vDR X-Received: by 2002:a63:d748:: with SMTP id w8mr29958745pgi.266.1618296227026; Mon, 12 Apr 2021 23:43:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618296227; cv=none; d=google.com; s=arc-20160816; b=tmaWkA9bqzZlG5SxMmyVPWAr9LoAmbkrid9qnHQNd8QrkD9QjxbtUwqaA1MQfqUSq0 DEqUzlp2rd2xwDFMA/OoQPHCCacVFBYQutJSRiCzfXJs7WkuZ+ByruQqKpCgqZ3mDSrL kPNW/0kyLVVO4G1VFARgT0CstFxzPvpyIXcgnnsloEhgu5blJkV8P/b+YUkDptgfVvXn BaFh+mgJw1Y6C4J0PoWL7Bb4YUF6slTS8WS9zZ+4hEzxHXFQ/vRwuj48CZ+WXhfaEceI jRaDnE6F324S2O4ZBCWShdlmV21qbvM/NSQ0jFML/1tvidWEJa7D3y3Y1uLlSWHXdUpE hoxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject; bh=vcItvP+D3zSStRplIFNHtMhB1YUVoDKJ32Fpdqg9L38=; b=Ql6agZ1LwgV57MpyPRNApAgULDfdxPsb99J/Cxmpo+xrl/BA6TaP+WyMb1rZHB3orK QV1rMbGtK/QmYnCylmGg+zh6n2YcaiXg0P66YJd/loXB+IRxgTJkYdCqAOtsHLwpOxy1 AvsGZ0grqI9VF+2Gwii8OHTXyDSncGjP1PImSqlNSH/a/ocPekxXgISeho4aimJKf7T8 Iuf7eT5u3nBH+HqUyVrRRkjtrj2B1ZWX5HTzikfjjlTEBaiW7zagTQhJmhE8Ye1dEaKv 26xbHqad+Pvvd7uTElhgjGhnFqabHecOB4I11HfA7lAQ/J3VodmvNyZDDcwc3SDxyo6b +dzw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n3si17597685pgt.383.2021.04.12.23.43.34; Mon, 12 Apr 2021 23:43:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230480AbhDLSqu (ORCPT + 99 others); Mon, 12 Apr 2021 14:46:50 -0400 Received: from mail-pl1-f182.google.com ([209.85.214.182]:36857 "EHLO mail-pl1-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229597AbhDLSqt (ORCPT ); Mon, 12 Apr 2021 14:46:49 -0400 Received: by mail-pl1-f182.google.com with SMTP id z22so1736421plo.3; Mon, 12 Apr 2021 11:46:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=vcItvP+D3zSStRplIFNHtMhB1YUVoDKJ32Fpdqg9L38=; b=KWycIMvRDimy2On2YYi1yq8GnsC7GedEDJCqBb/yVWr8M0PWSkOOAf12CEdGXbbyfw FTyNP4BjNTs2JqxhQ++Zyd03i5fsL5Pfrp1HaFST9pnj6MXIz0aaLUUoexqqiIpjmkPO 3od8aIqIH51MIMtzj4AGv6Gz87ghdHgoWIVf9Or6d+oZl5iOtGN9c6siwZD7pYTAA7/P fPoYRucObGgTkG8taFLK/Xz8ZUDtxI30SdLDBvdPw5+Xr5dkBW/GPHLK1N6VxGeuKGVn qF+W9tNIoaaMnSVFKCuw8JSyRLTKvzcKFSOL1PSDjUfbLRDTxN567lEv5jExKN+PG7le X7Bg== X-Gm-Message-State: AOAM533XLIf0dxLby+Z4iaFHR/2bcLjT6M+WXsknNDKB/lxgMnqV5vMI E60ZNQ1C4DC2Vt4G93Ig/1c= X-Received: by 2002:a17:90b:1bcc:: with SMTP id oa12mr592191pjb.77.1618253189069; Mon, 12 Apr 2021 11:46:29 -0700 (PDT) Received: from ?IPv6:2601:647:4000:d7:5f68:b2bd:8704:6a68? ([2601:647:4000:d7:5f68:b2bd:8704:6a68]) by smtp.gmail.com with ESMTPSA id x12sm132375pjk.53.2021.04.12.11.46.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Apr 2021 11:46:28 -0700 (PDT) Subject: Re: [PATCH -next] RDMA/srpt: Fix error return code in srpt_cm_req_recv() To: Jason Gunthorpe Cc: Wang Wensheng , dledford@redhat.com, linux-rdma@vger.kernel.org, target-devel@vger.kernel.org, linux-kernel@vger.kernel.org, rui.xiang@huawei.com References: <20210408113132.87250-1-wangwensheng4@huawei.com> <241d391f-2f18-18e5-9e3f-3cf214a30b38@acm.org> <20210412180904.GA1152997@nvidia.com> From: Bart Van Assche Message-ID: <966eef91-0eee-beea-b927-7a4aa1b8fbd4@acm.org> Date: Mon, 12 Apr 2021 11:46:26 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210412180904.GA1152997@nvidia.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 4/12/21 11:09 AM, Jason Gunthorpe wrote: > On Thu, Apr 08, 2021 at 09:50:30AM -0700, Bart Van Assche wrote: >> On 4/8/21 4:31 AM, Wang Wensheng wrote: >>> Fix to return a negative error code from the error handling >>> case instead of 0, as done elsewhere in this function. >>> >>> Fixes: db7683d7deb2 ("IB/srpt: Fix login-related race conditions") >>> Reported-by: Hulk Robot >>> Signed-off-by: Wang Wensheng >>> drivers/infiniband/ulp/srpt/ib_srpt.c | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c >>> index 98a393d..ea44780 100644 >>> +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c >>> @@ -2382,6 +2382,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev, >>> pr_info("rejected SRP_LOGIN_REQ because target %s_%d is not enabled\n", >>> dev_name(&sdev->device->dev), port_num); >>> mutex_unlock(&sport->mutex); >>> + ret = -EINVAL; >>> goto reject; >>> } >> >> Please fix the Hulk Robot. The following code occurs three lines above >> the modified code: >> >> ret = -EINVAL; > > That is a different if. > > The patch looks correct to me, please check again: > > ret = srpt_create_ch_ib(ch); > if (ret) { > // Ret is proven to be 0 > > [..] > > if (!sport->enabled) { > rej->reason = cpu_to_be32( > SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES); > pr_info("rejected SRP_LOGIN_REQ because target %s_%d is not enabled\n", > dev_name(&sdev->device->dev), port_num); > goto reject; // Ret is 0 > > If there is an assignment to ret between those two blocks it is hidden.. Right, I was looking at another if-statement in the same function. Bart.