From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1khXCy-0005hw-PP for mharc-qemu-trivial@gnu.org; Tue, 24 Nov 2020 07:14:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khXCr-0005h9-OM; Tue, 24 Nov 2020 07:14:02 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khXCm-000884-Vd; Tue, 24 Nov 2020 07:14:01 -0500 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CgNG55GQ9zLsqx; Tue, 24 Nov 2020 20:13:17 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Tue, 24 Nov 2020 20:13:36 +0800 Message-ID: <5FBCF8F0.9060103@huawei.com> Date: Tue, 24 Nov 2020 20:13:36 +0800 From: Alex Chen User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: Marcel Apfelbaum CC: Yuval Shaia , , Laurent Vivier , , , QEMU , Subject: Re: [PATCH] contrib/rdmacm-mux: Fix error condition in hash_tbl_search_fd_by_ifid() References: <5F9AC6FF.4000301@huawei.com> In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.187.138] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.191; envelope-from=alex.chen@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2020 12:14:03 -0000 Hi everyone， Who can help me merge this patch into the master branch? This patch may be need for qemu-5.2 Thanks， Alex On 2020/11/4 0:35, Marcel Apfelbaum wrote: > Hi Alex, > > On Thu, Oct 29, 2020 at 3:43 PM AlexChen > wrote: > > When fd is not found according to ifid, the _hash_tbl_search_fd_by_ifid() > returns 0 and assigns the result to *fd, so We have to check that *fd is 0, > not that fd is 0. > > Reported-by: Euler Robot > > Signed-off-by: AlexChen > > --- > contrib/rdmacm-mux/main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c > index bd82abbad3..771ca01e03 100644 > --- a/contrib/rdmacm-mux/main.c > +++ b/contrib/rdmacm-mux/main.c > @@ -186,7 +186,7 @@ static int hash_tbl_search_fd_by_ifid(int *fd, __be64 *gid_ifid) > *fd = _hash_tbl_search_fd_by_ifid(gid_ifid); > pthread_rwlock_unlock(&server.lock); > > - if (!fd) { > + if (!*fd) { > syslog(LOG_WARNING, "Can't find matching for ifid 0x%llx\n", *gid_ifid); > return -ENOENT; > } > -- > 2.19.1 > > > Reviewed-by: Marcel Apfelbaum > > > Thanks for the fix, > Marcel > > 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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 C5EA7C56201 for ; Tue, 24 Nov 2020 12:15:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D8D772076B for ; Tue, 24 Nov 2020 12:15:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8D772076B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khXEL-0006K1-Kv for qemu-devel@archiver.kernel.org; Tue, 24 Nov 2020 07:15:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khXCr-0005h9-OM; Tue, 24 Nov 2020 07:14:02 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khXCm-000884-Vd; Tue, 24 Nov 2020 07:14:01 -0500 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CgNG55GQ9zLsqx; Tue, 24 Nov 2020 20:13:17 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Tue, 24 Nov 2020 20:13:36 +0800 Message-ID: <5FBCF8F0.9060103@huawei.com> Date: Tue, 24 Nov 2020 20:13:36 +0800 From: Alex Chen User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: Marcel Apfelbaum Subject: Re: [PATCH] contrib/rdmacm-mux: Fix error condition in hash_tbl_search_fd_by_ifid() References: <5F9AC6FF.4000301@huawei.com> In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.187.138] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.191; envelope-from=alex.chen@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, qemu-trivial@nongnu.org, mjt@tls.msk.ru, QEMU , Yuval Shaia , zhengchuan@huawei.com, Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi everyone， Who can help me merge this patch into the master branch? This patch may be need for qemu-5.2 Thanks， Alex On 2020/11/4 0:35, Marcel Apfelbaum wrote: > Hi Alex, > > On Thu, Oct 29, 2020 at 3:43 PM AlexChen > wrote: > > When fd is not found according to ifid, the _hash_tbl_search_fd_by_ifid() > returns 0 and assigns the result to *fd, so We have to check that *fd is 0, > not that fd is 0. > > Reported-by: Euler Robot > > Signed-off-by: AlexChen > > --- > contrib/rdmacm-mux/main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c > index bd82abbad3..771ca01e03 100644 > --- a/contrib/rdmacm-mux/main.c > +++ b/contrib/rdmacm-mux/main.c > @@ -186,7 +186,7 @@ static int hash_tbl_search_fd_by_ifid(int *fd, __be64 *gid_ifid) > *fd = _hash_tbl_search_fd_by_ifid(gid_ifid); > pthread_rwlock_unlock(&server.lock); > > - if (!fd) { > + if (!*fd) { > syslog(LOG_WARNING, "Can't find matching for ifid 0x%llx\n", *gid_ifid); > return -ENOENT; > } > -- > 2.19.1 > > > Reviewed-by: Marcel Apfelbaum > > > Thanks for the fix, > Marcel > >