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=-11.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 C64CCC4338F for ; Mon, 9 Aug 2021 19:25:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB4D461051 for ; Mon, 9 Aug 2021 19:25:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236016AbhHIT0K (ORCPT ); Mon, 9 Aug 2021 15:26:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:48164 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231439AbhHIT0I (ORCPT ); Mon, 9 Aug 2021 15:26:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B815260F6F; Mon, 9 Aug 2021 19:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628537148; bh=twBLIsO2gnc36cl6xqHR0kjG3giBwiknGjje0BZ4aR8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=mevWqoYdg9oz+jP2iUW+hDcASnMnEF8AD8JOpuzPVEfX+7Jm0qiUChixUYig4fbFE zOdHaYabOmC6Q6tw4f4FF/5aT/9/34+e0EG9SqlFPwMNUd4/cLaeRXqt4iPLpFAyNw oD4GfJjUTwRKrcfLWxTqQFyopLbtaeSRd+rV8qytKcph0mNGzbtdgDJGdkz1hkebuQ epnnuU+naQDJ0TxhHVBkVPvAbCgPBp3T7Cx9FGbFXxWj838XBoXc+Oc+QV7tjgGCX4 upfmc7oBT9npF/pY/57RTfKkqDG0zAao37oipVyYhG+RHxuhbmrPweF8rvu3Q8g+hh NQfiJgLmw1MYQ== Date: Mon, 9 Aug 2021 12:25:46 -0700 From: Jakub Kicinski To: Pali =?UTF-8?B?Um9ow6Fy?= Cc: Paul Mackerras , "David S. Miller" , Guillaume Nault , linux-ppp@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ppp: Add rtnl attribute IFLA_PPP_UNIT_ID for specifying ppp unit id Message-ID: <20210809122546.758e41de@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: <20210807163749.18316-1-pali@kernel.org> References: <20210807163749.18316-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Sat, 7 Aug 2021 18:37:49 +0200 Pali Roh=C3=A1r wrote: > Currently there are two ways how to create a new ppp interface. Old method > via ioctl(PPPIOCNEWUNIT) and new method via rtnl RTM_NEWLINK/NLM_F_CREATE > which was introduced in v4.7 by commit 96d934c70db6 ("ppp: add rtnetlink > device creation support"). >=20 > ... Your 2 previous patches were fixes and went into net, this patch seems to be on top of them but is a feature, so should go to net-next.=20 But it doesn't apply to net-next given net was not merged into net-next. Please rebase on top of net-next or (preferably) wait until next week so that the trees can get merged and then you can repost without causing any conflicts. > static const struct nla_policy ppp_nl_policy[IFLA_PPP_MAX + 1] =3D { > [IFLA_PPP_DEV_FD] =3D { .type =3D NLA_S32 }, > + [IFLA_PPP_UNIT_ID] =3D { .type =3D NLA_S32 }, > }; set .strict_start_type, please so new attrs get validated better > static int ppp_nl_validate(struct nlattr *tb[], struct nlattr *data[], > @@ -1274,6 +1277,15 @@ static int ppp_nl_validate(struct nlattr *tb[], st= ruct nlattr *data[], > =20 > if (!data[IFLA_PPP_DEV_FD]) > return -EINVAL; > + > + /* Check for IFLA_PPP_UNIT_ID before IFLA_PPP_DEV_FD to allow userspace > + * detect if kernel supports IFLA_PPP_UNIT_ID or not by specifying > + * negative IFLA_PPP_DEV_FD. Previous kernel versions ignored > + * IFLA_PPP_UNIT_ID attribute. > + */ > + if (data[IFLA_PPP_UNIT_ID] && nla_get_s32(data[IFLA_PPP_UNIT_ID]) < -1) > + return -EINVAL; please use NLA_POLICY_MIN() instead, no need to open-code > if (nla_get_s32(data[IFLA_PPP_DEV_FD]) < 0) > return -EBADF;