[{"id":2258388,"web_url":"http://patchwork.ozlabs.org/comment/2258388/","msgid":"<20190912145147.GR3431@localhost.localdomain>","list_archive_url":null,"date":"2019-09-12T14:51:47","subject":"Re: [PATCH v2 net 1/3] sctp: change return type of\n\tsctp_get_port_local","submitter":{"id":65333,"url":"http://patchwork.ozlabs.org/api/people/65333/","name":"Marcelo Ricardo Leitner","email":"marcelo.leitner@gmail.com"},"content":"On Thu, Sep 12, 2019 at 12:02:17PM +0800, Mao Wenan wrote:\n> Currently sctp_get_port_local() returns a long\n> which is either 0,1 or a pointer casted to long.\n> It's neither of the callers use the return value since\n> commit 62208f12451f (\"net: sctp: simplify sctp_get_port\").\n> Now two callers are sctp_get_port and sctp_do_bind,\n> they actually assumend a casted to an int was the same as\n> a pointer casted to a long, and they don't save the return\n> value just check whether it is zero or non-zero, so\n> it would better change return type from long to int for\n> sctp_get_port_local.\n> \n> Fixes: 1da177e4c3f4 (\"Linux-2.6.12-rc2\")\n\nThis Fixes tag is not needed. It's just a cleanup.\nMaybe Dave can remove it for us.\n\nAcked-by: Marcelo Ricardo Leitner \n\nThanks.\n\n> Signed-off-by: Mao Wenan \n> ---\n> net/sctp/socket.c | 8 ++++----\n> 1 file changed, 4 insertions(+), 4 deletions(-)\n> \n> diff --git a/net/sctp/socket.c b/net/sctp/socket.c\n> index 9d1f83b10c0a..5e1934c48709 100644\n> --- a/net/sctp/socket.c\n> +++ b/net/sctp/socket.c\n> @@ -309,7 +309,7 @@ static int sctp_bind(struct sock *sk, struct sockaddr *addr, int addr_len)\n> \treturn retval;\n> }\n> \n> -static long sctp_get_port_local(struct sock *, union sctp_addr *);\n> +static int sctp_get_port_local(struct sock *, union sctp_addr *);\n> \n> /* Verify this is a valid sockaddr. */\n> static struct sctp_af *sctp_sockaddr_af(struct sctp_sock *opt,\n> @@ -7998,7 +7998,7 @@ static void sctp_unhash(struct sock *sk)\n> static struct sctp_bind_bucket *sctp_bucket_create(\n> \tstruct sctp_bind_hashbucket *head, struct net *, unsigned short snum);\n> \n> -static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)\n> +static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)\n> {\n> \tstruct sctp_sock *sp = sctp_sk(sk);\n> \tbool reuse = (sk->sk_reuse || sp->reuse);\n> @@ -8108,7 +8108,7 @@ static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)\n> \n> \t\t\tif (sctp_bind_addr_conflict(&ep2->base.bind_addr,\n> \t\t\t\t\t\t addr, sp2, sp)) {\n> -\t\t\t\tret = (long)sk2;\n> +\t\t\t\tret = 1;\n> \t\t\t\tgoto fail_unlock;\n> \t\t\t}\n> \t\t}\n> @@ -8180,7 +8180,7 @@ static int sctp_get_port(struct sock *sk, unsigned short snum)\n> \taddr.v4.sin_port = htons(snum);\n> \n> \t/* Note: sk->sk_num gets filled in if ephemeral port request. */\n> -\treturn !!sctp_get_port_local(sk, &addr);\n> +\treturn sctp_get_port_local(sk, &addr);\n> }\n> \n> /*\n> -- \n> 2.20.1\n>","headers":{"Return-Path":"","X-Original-To":"patchwork-incoming-netdev@ozlabs.org","Delivered-To":"patchwork-incoming-netdev@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org;\n\tdmarc=pass (p=none dis=none) header.from=gmail.com","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"ky9CpUPU\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 46ThYk63C8z9sNT\n\tfor ;\n\tFri, 13 Sep 2019 00:51:54 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1732817AbfILOvw (ORCPT\n\t);\n\tThu, 12 Sep 2019 10:51:52 -0400","from mail-qk1-f195.google.com ([209.85.222.195]:39239 \"EHLO\n\tmail-qk1-f195.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1732444AbfILOvw (ORCPT\n\t); Thu, 12 Sep 2019 10:51:52 -0400","by mail-qk1-f195.google.com with SMTP id 4so24722387qki.6;\n\tThu, 12 Sep 2019 07:51:51 -0700 (PDT)","from localhost.localdomain ([177.220.172.89])\n\tby smtp.gmail.com with ESMTPSA id\n\to124sm11916258qke.66.2019.09.12.07.51.49\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 12 Sep 2019 07:51:50 -0700 (PDT)","by localhost.localdomain (Postfix, from userid 1000)\n\tid 81A51C0DAD; Thu, 12 Sep 2019 11:51:47 -0300 (-03)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:in-reply-to:user-agent;\n\tbh=flpHUM3jIkqI5icvoEOQORa60za63cCS1Ns8QwP4lnY=;\n\tb=ky9CpUPU47G6GUX0BIje7EzJ/ntOeM73UZXhIwpoeyGviRskd/VkQIsgCQdbWfYSHA\n\twWE31DHF63FaXtmgpLeifzIb/9R+pAq0NQVsgZCwiJvhWAP6DKOJx/Qfyt8c18q86epS\n\twX5ufGJ3GT+l0wZ4XhmRMiL98M4qiAkFvxPNrjNlO8hLvXg1TmzNyX/6Iui95Y85WF2s\n\tAxjOWrpVcXjOY8YUxQ5iJG1cLaqh1P18RoM9r8rtwOIBFG0cwSdeQX+i7Fa7CvXLZ9sw\n\tNDeYYTlS6R+cR/Uj2tw5U+D8DOnz1WiiwwGa+/2gnS4CnEjJb7ecnmBSIqq/but5Vyyh\n\t0yYQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:in-reply-to:user-agent;\n\tbh=flpHUM3jIkqI5icvoEOQORa60za63cCS1Ns8QwP4lnY=;\n\tb=ckNlRN3W6H5WWx+itME4H+XUtKQXk/YkL0ITnaxTguHbIh/hoUWnn19ueOXRVmGP54\n\tkO+Hn4dT7o0URks8XKmnNq2eZyYPjBYGxwVbIz3KYEu/BnzaxQP8OuTIBekyzgMLj05t\n\traDtwlooohGW+cx+XED/Y/KegsO2INMhQrfFxbnVV0rEuwPLjUrfsUMumqFMbFhi/8ZR\n\tJ+JKYnu5rPdpIC3/YBCGhcBez36eC6ckZMM6or4Fd2pbA0oTEiCylbRQ6snP0seJdNr0\n\tfNsBKRB/2uPohBwhppNrkwCuNXuAeX5nAZbh9jLxwG3flZQHQTdhvjXnTWsc5DoZakkP\n\t0Rcw==","X-Gm-Message-State":"APjAAAUXIUm6SFfM4R4Fvix4dwCrRcZHNZd+PzzSTgDh2lFY/Gfa1xxA\n\tskg+lRvVWNYnVUeNkd/4e+Y=","X-Google-Smtp-Source":"APXvYqwJjh6Ss0MSjgLzgAgt6qtY9jxy5QyWWaHHI+LEeuXS7W9KlLQgPjzbQnd6rbfA74odGYvx5Q==","X-Received":"by 2002:a37:a586:: with SMTP id\n\to128mr21410644qke.147.1568299910876; \n\tThu, 12 Sep 2019 07:51:50 -0700 (PDT)","Date":"Thu, 12 Sep 2019 11:51:47 -0300","From":"Marcelo Ricardo Leitner ","To":"Mao Wenan ","Cc":"vyasevich@gmail.com, nhorman@tuxdriver.com, davem@davemloft.net,\n\tlinux-sctp@vger.kernel.org, netdev@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org","Subject":"Re: [PATCH v2 net 1/3] sctp: change return type of\n\tsctp_get_port_local","Message-ID":"<20190912145147.GR3431@localhost.localdomain>","References":"<7a450679-40ca-8a84-4cba-7a16f22ea3c0@huawei.com>\n\t<20190912040219.67517-1-maowenan@huawei.com>\n\t<20190912040219.67517-2-maowenan@huawei.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20190912040219.67517-2-maowenan@huawei.com>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"}}]