{"id":1161351,"url":"http://patchwork.ozlabs.org/api/patches/1161351/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20190912040219.67517-2-maowenan@huawei.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20190912040219.67517-2-maowenan@huawei.com>","list_archive_url":null,"date":"2019-09-12T04:02:17","name":"[v2,net,1/3] sctp: change return type of sctp_get_port_local","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"839926888f5012ad73abc862f226b23a9402a050","submitter":{"id":70289,"url":"http://patchwork.ozlabs.org/api/people/70289/?format=json","name":"maowenan","email":"maowenan@huawei.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20190912040219.67517-2-maowenan@huawei.com/mbox/","series":[{"id":130322,"url":"http://patchwork.ozlabs.org/api/series/130322/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=130322","date":"2019-09-12T04:02:16","name":"fix memory leak for sctp_do_bind","version":2,"mbox":"http://patchwork.ozlabs.org/series/130322/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1161351/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1161351/checks/","tags":{},"related":[],"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=none (p=none dis=none) header.from=huawei.com"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 46TPmd5sYnz9sN1\n\tfor ;\n\tThu, 12 Sep 2019 13:45:21 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1729660AbfILDpB (ORCPT\n\t);\n\tWed, 11 Sep 2019 23:45:01 -0400","from szxga04-in.huawei.com ([45.249.212.190]:2217 \"EHLO huawei.com\"\n\trhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP\n\tid S1726157AbfILDpB (ORCPT );\n\tWed, 11 Sep 2019 23:45:01 -0400","from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60])\n\tby Forcepoint Email with ESMTP id 035C1B7E71A04F8CF1B3;\n\tThu, 12 Sep 2019 11:44:59 +0800 (CST)","from localhost.localdomain.localdomain (10.175.113.25) by\n\tDGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP\n\tServer id 14.3.439.0; Thu, 12 Sep 2019 11:44:52 +0800"],"From":"Mao Wenan ","To":", ,\n\t, ","CC":", ,\n\t, ,\n\tMao Wenan ","Subject":"[PATCH v2 net 1/3] sctp: change return type of sctp_get_port_local","Date":"Thu, 12 Sep 2019 12:02:17 +0800","Message-ID":"<20190912040219.67517-2-maowenan@huawei.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190912040219.67517-1-maowenan@huawei.com>","References":"<7a450679-40ca-8a84-4cba-7a16f22ea3c0@huawei.com>\n\t<20190912040219.67517-1-maowenan@huawei.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"7BIT","Content-Type":"text/plain; charset=US-ASCII","X-Originating-IP":"[10.175.113.25]","X-CFilter-Loop":"Reflected","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Currently sctp_get_port_local() returns a long\nwhich is either 0,1 or a pointer casted to long.\nIt's neither of the callers use the return value since\ncommit 62208f12451f (\"net: sctp: simplify sctp_get_port\").\nNow two callers are sctp_get_port and sctp_do_bind,\nthey actually assumend a casted to an int was the same as\na pointer casted to a long, and they don't save the return\nvalue just check whether it is zero or non-zero, so\nit would better change return type from long to int for\nsctp_get_port_local.\n\nFixes: 1da177e4c3f4 (\"Linux-2.6.12-rc2\")\nSigned-off-by: Mao Wenan \n---\n net/sctp/socket.c | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)","diff":"diff --git a/net/sctp/socket.c b/net/sctp/socket.c\nindex 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","prefixes":["v2","net","1/3"]}