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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT 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 247BCC10F14 for ; Wed, 10 Apr 2019 11:21:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1CB520820 for ; Wed, 10 Apr 2019 11:21:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554895309; bh=dqPAlVZ+ueRijL7tllwHbPSVK/xWFUD26zIVw3fkwXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IuGF7ePe8WaNuLQw+shVUN3h3KjF5XMa4o1pGBfINq/jNaHPtyVKlOWRoMAsjtcu7 abpXD83jxHeBzPl6GY2oyODrGVtnfCTM2jTdtlDyrKlMXNPJlUHFOJs1reGiXT1BsD 87cjmp/+eIqNljIE/2rshbrYXQajesycCZ8Trtbg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731321AbfDJLVr (ORCPT ); Wed, 10 Apr 2019 07:21:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:36398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728757AbfDJLVq (ORCPT ); Wed, 10 Apr 2019 07:21:46 -0400 Received: from localhost (unknown [77.138.135.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E46D720818; Wed, 10 Apr 2019 11:21:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554895305; bh=dqPAlVZ+ueRijL7tllwHbPSVK/xWFUD26zIVw3fkwXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0MCmnlhDROLo3lNyMtg4sQdsk39xN3pmQu6Yo9CX6GVg+e3msQG995j9Q8PFdDdFg JGjiRGaAWRNaBMB+hG6auxovRRxCLuAc87+Ih7i1DMuu+Os8vjOCzVdT4VvurWoriI cuNEDB0Y7x3RGomzsbR54AICrzvjqtqtOZYjfTq4= From: Leon Romanovsky To: David Ahern Cc: Leon Romanovsky , netdev , Mark Zhang , RDMA mailing list , Stephen Hemminger Subject: [PATCH iproute2-next 5/8] rdma: Make get_port_from_argv() returns valid port in strict port mode Date: Wed, 10 Apr 2019 14:21:18 +0300 Message-Id: <20190410112121.6790-6-leon@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190410112121.6790-1-leon@kernel.org> References: <20190410112121.6790-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Mark Zhang When strict_port is set, make get_port_from_argv() returns failure if no valid port is specified. Signed-off-by: Mark Zhang Signed-off-by: Leon Romanovsky --- rdma/utils.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rdma/utils.c b/rdma/utils.c index 1fda2879..8dc06fc6 100644 --- a/rdma/utils.c +++ b/rdma/utils.c @@ -56,7 +56,7 @@ bool rd_no_arg(struct rd *rd) * mlx5_1/1 | 1 | false * mlx5_1/- | 0 | false * - * In strict mode, /- will return error. + * In strict port mode, a non-0 port must be provided */ static int get_port_from_argv(struct rd *rd, uint32_t *port, bool *is_dump_all, bool strict_port) @@ -64,7 +64,7 @@ static int get_port_from_argv(struct rd *rd, uint32_t *port, char *slash; *port = 0; - *is_dump_all = true; + *is_dump_all = strict_port ? false : true; slash = strchr(rd_argv(rd), '/'); /* if no port found, return 0 */ @@ -83,6 +83,9 @@ static int get_port_from_argv(struct rd *rd, uint32_t *port, if (!*port && strlen(slash)) return -EINVAL; } + if (strict_port && (*port == 0)) + return -EINVAL; + return 0; } -- 2.20.1