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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 54B76C49ED6 for ; Thu, 12 Sep 2019 02:05:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2540F2067B for ; Thu, 12 Sep 2019 02:05:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728910AbfILCFz (ORCPT ); Wed, 11 Sep 2019 22:05:55 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:51442 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727329AbfILCFy (ORCPT ); Wed, 11 Sep 2019 22:05:54 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 4DE8C1757141C85581C3; Thu, 12 Sep 2019 10:05:50 +0800 (CST) Received: from [127.0.0.1] (10.177.96.96) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.439.0; Thu, 12 Sep 2019 10:05:49 +0800 Subject: Re: [PATCH net 1/2] sctp: remove redundant assignment when call sctp_get_port_local To: Marcelo Ricardo Leitner , Dan Carpenter CC: , , , , , , References: <20190910071343.18808-1-maowenan@huawei.com> <20190910071343.18808-2-maowenan@huawei.com> <20190910185710.GF15977@kadam> <20190910192207.GE20699@kadam> <53556c87-a351-4314-cbd9-49a39d0b41aa@huawei.com> <20190911083038.GF20699@kadam> <20190911143008.GD3499@localhost.localdomain> <20190911143923.GE3499@localhost.localdomain> From: maowenan Message-ID: <7a450679-40ca-8a84-4cba-7a16f22ea3c0@huawei.com> Date: Thu, 12 Sep 2019 10:05:45 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.0 MIME-Version: 1.0 In-Reply-To: <20190911143923.GE3499@localhost.localdomain> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.96.96] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2019/9/11 22:39, Marcelo Ricardo Leitner wrote: > On Wed, Sep 11, 2019 at 11:30:08AM -0300, Marcelo Ricardo Leitner wrote: >> On Wed, Sep 11, 2019 at 11:30:38AM +0300, Dan Carpenter wrote: >>> On Wed, Sep 11, 2019 at 09:30:47AM +0800, maowenan wrote: >>>> >>>> >>>> On 2019/9/11 3:22, Dan Carpenter wrote: >>>>> On Tue, Sep 10, 2019 at 09:57:10PM +0300, Dan Carpenter wrote: >>>>>> On Tue, Sep 10, 2019 at 03:13:42PM +0800, Mao Wenan wrote: >>>>>>> There are more parentheses in if clause when call sctp_get_port_local >>>>>>> in sctp_do_bind, and redundant assignment to 'ret'. This patch is to >>>>>>> do cleanup. >>>>>>> >>>>>>> Signed-off-by: Mao Wenan >>>>>>> --- >>>>>>> net/sctp/socket.c | 3 +-- >>>>>>> 1 file changed, 1 insertion(+), 2 deletions(-) >>>>>>> >>>>>>> diff --git a/net/sctp/socket.c b/net/sctp/socket.c >>>>>>> index 9d1f83b10c0a..766b68b55ebe 100644 >>>>>>> --- a/net/sctp/socket.c >>>>>>> +++ b/net/sctp/socket.c >>>>>>> @@ -399,9 +399,8 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) >>>>>>> * detection. >>>>>>> */ >>>>>>> addr->v4.sin_port = htons(snum); >>>>>>> - if ((ret = sctp_get_port_local(sk, addr))) { >>>>>>> + if (sctp_get_port_local(sk, addr)) >>>>>>> return -EADDRINUSE; >>>>>> >>>>>> sctp_get_port_local() returns a long which is either 0,1 or a pointer >>>>>> casted to long. It's not documented what it means and neither of the >>>>>> callers use the return since commit 62208f12451f ("net: sctp: simplify >>>>>> sctp_get_port"). >>>>> >>>>> Actually it was commit 4e54064e0a13 ("sctp: Allow only 1 listening >>>>> socket with SO_REUSEADDR") from 11 years ago. That patch fixed a bug, >>>>> because before the code assumed that a pointer casted to an int was the >>>>> same as a pointer casted to a long. >>>> >>>> commit 4e54064e0a13 treated non-zero return value as unexpected, so the current >>>> cleanup is ok? >>> >>> Yeah. It's fine, I was just confused why we weren't preserving the >>> error code and then I saw that we didn't return errors at all and got >>> confused. >> >> But please lets seize the moment and do the change Dean suggested. > > *Dan*, sorry. > >> This was the last place saving this return value somewhere. It makes >> sense to cleanup sctp_get_port_local() now and remove that masked >> pointer return. >> >> Then you may also cleanup: >> socket.c: return !!sctp_get_port_local(sk, &addr); >> as it will be a direct map. Thanks Marcelo, shall I post a new individual patch for cleanup as your suggest? >> >> Marcelo >> > > . > From mboxrd@z Thu Jan 1 00:00:00 1970 From: maowenan Date: Thu, 12 Sep 2019 02:05:45 +0000 Subject: Re: [PATCH net 1/2] sctp: remove redundant assignment when call sctp_get_port_local Message-Id: <7a450679-40ca-8a84-4cba-7a16f22ea3c0@huawei.com> List-Id: References: <20190910071343.18808-1-maowenan@huawei.com> <20190910071343.18808-2-maowenan@huawei.com> <20190910185710.GF15977@kadam> <20190910192207.GE20699@kadam> <53556c87-a351-4314-cbd9-49a39d0b41aa@huawei.com> <20190911083038.GF20699@kadam> <20190911143008.GD3499@localhost.localdomain> <20190911143923.GE3499@localhost.localdomain> In-Reply-To: <20190911143923.GE3499@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Marcelo Ricardo Leitner , Dan Carpenter Cc: vyasevich@gmail.com, nhorman@tuxdriver.com, davem@davemloft.net, linux-sctp@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org On 2019/9/11 22:39, Marcelo Ricardo Leitner wrote: > On Wed, Sep 11, 2019 at 11:30:08AM -0300, Marcelo Ricardo Leitner wrote: >> On Wed, Sep 11, 2019 at 11:30:38AM +0300, Dan Carpenter wrote: >>> On Wed, Sep 11, 2019 at 09:30:47AM +0800, maowenan wrote: >>>> >>>> >>>> On 2019/9/11 3:22, Dan Carpenter wrote: >>>>> On Tue, Sep 10, 2019 at 09:57:10PM +0300, Dan Carpenter wrote: >>>>>> On Tue, Sep 10, 2019 at 03:13:42PM +0800, Mao Wenan wrote: >>>>>>> There are more parentheses in if clause when call sctp_get_port_local >>>>>>> in sctp_do_bind, and redundant assignment to 'ret'. This patch is to >>>>>>> do cleanup. >>>>>>> >>>>>>> Signed-off-by: Mao Wenan >>>>>>> --- >>>>>>> net/sctp/socket.c | 3 +-- >>>>>>> 1 file changed, 1 insertion(+), 2 deletions(-) >>>>>>> >>>>>>> diff --git a/net/sctp/socket.c b/net/sctp/socket.c >>>>>>> index 9d1f83b10c0a..766b68b55ebe 100644 >>>>>>> --- a/net/sctp/socket.c >>>>>>> +++ b/net/sctp/socket.c >>>>>>> @@ -399,9 +399,8 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) >>>>>>> * detection. >>>>>>> */ >>>>>>> addr->v4.sin_port = htons(snum); >>>>>>> - if ((ret = sctp_get_port_local(sk, addr))) { >>>>>>> + if (sctp_get_port_local(sk, addr)) >>>>>>> return -EADDRINUSE; >>>>>> >>>>>> sctp_get_port_local() returns a long which is either 0,1 or a pointer >>>>>> casted to long. It's not documented what it means and neither of the >>>>>> callers use the return since commit 62208f12451f ("net: sctp: simplify >>>>>> sctp_get_port"). >>>>> >>>>> Actually it was commit 4e54064e0a13 ("sctp: Allow only 1 listening >>>>> socket with SO_REUSEADDR") from 11 years ago. That patch fixed a bug, >>>>> because before the code assumed that a pointer casted to an int was the >>>>> same as a pointer casted to a long. >>>> >>>> commit 4e54064e0a13 treated non-zero return value as unexpected, so the current >>>> cleanup is ok? >>> >>> Yeah. It's fine, I was just confused why we weren't preserving the >>> error code and then I saw that we didn't return errors at all and got >>> confused. >> >> But please lets seize the moment and do the change Dean suggested. > > *Dan*, sorry. > >> This was the last place saving this return value somewhere. It makes >> sense to cleanup sctp_get_port_local() now and remove that masked >> pointer return. >> >> Then you may also cleanup: >> socket.c: return !!sctp_get_port_local(sk, &addr); >> as it will be a direct map. Thanks Marcelo, shall I post a new individual patch for cleanup as your suggest? >> >> Marcelo >> > > . >