From nobody Wed Jan 29 23:49:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjzQJ2gnKz5mBcv; Wed, 29 Jan 2025 23:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjzQJ1DZCz3C3P; Wed, 29 Jan 2025 23:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738194552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QRPD/t8Qeb8EQ8L/nyxrWOZ+sBviDgGpjrhEpbZmE74=; b=nOxYmrxKiPK/UsKuaBd9UKV6Z8SoNK1PrhW8Rcoi4pqeqAZbx3tZnpbbLJ7VEHR7WNQ5cI wP0gMM+eS0EQIfGRw1QA/5826+jtAvqUkmvA7c7kLPPuiBc/xIuZEKQdDBnX/5nnSkLyYx IS8EW3dBKtSAyqJDMJOl1HIHd9oLPrJOJN1aPVyytbfnfm6TxEQ8YJLYkWv99EbmZhYzIv 6r6OLNqxZGmB4SZbxMlbTOU4fwJj6ap7o43DRrigN1TZ6iYLkXdOMY8WL8ZCZbyemGV/WP TpbLqm/wSUkNqlFCaVIBr50UzbymQoETP7ZuYSXPvNqOnkkkWCCuBKWvWPOQJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738194552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QRPD/t8Qeb8EQ8L/nyxrWOZ+sBviDgGpjrhEpbZmE74=; b=l026LHyBWXOzocL4SWsDjh2Mr4LCrk7e8ekLfLbqbnC9u8WkrWQMysAN+VYwzrOq9LkoaN qhf/49jX9EqQ2UU7ijbHbC2fyBRRfbPQN4hNW7kk2I+pQE25k9RBFU3l7B4WYthIjTA4fH AD50DCxcTiiWYodkZe+e1aFTFRaWJB+f/3nHcHpUwVYHDuqI6TEiH3hfG6bPWuHAGdzW15 9vieLCZN3h+A8F1C3FQqQSRRnJkYMMcHZ1UhlCMjjYg08gAPkOzXki6lJQmyrDyRAPq1Pn 9Q0H9ANRmPhfok3gEJLE6zECVOfHOrr0UhjzFtX9PC79MBlE+MvUjkXM8vJXUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738194552; a=rsa-sha256; cv=none; b=RkGax/2TlYShHxn17znl+6QsLoeHZjUCo8nlRsfPQ3YbYU3iG+QkFhbO2pxjSNn9lGMc0L 6KEzsEKdv99SGsIh4ofOujyrKV/vd122ftNpB9cMcJIGd2u21PC/JWMKUtFnjxlHDpdTRG vQfl4ni48Baonigij4VHBwnVnqGyXN0It5gByAwBGEZ5epp4XGfaYTSR3edjMJtwLvXgTd C1I6b3v78IVAaSlUfmtZfMQZQQ25MrxYd+tTTrJ+w9LN/zFqjZ7fGSRbnrFe98yJn3vJsk 9IFEnFrE0SkMmHK5EvZj6PYk9ptr3C11f8yK/CrIKAjRBuT13lqb0O5edoC1FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YjzQJ0Xvvz7Mg; Wed, 29 Jan 2025 23:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50TNnBl0007190; Wed, 29 Jan 2025 23:49:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TNnBvA007187; Wed, 29 Jan 2025 23:49:11 GMT (envelope-from git) Date: Wed, 29 Jan 2025 23:49:11 GMT Message-Id: <202501292349.50TNnBvA007187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 810c122695d7 - main - netlink: use u_int as argument for ifnet_byindex() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 810c122695d72d277a07a2854172d6fd09fc9907 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=810c122695d72d277a07a2854172d6fd09fc9907 commit 810c122695d72d277a07a2854172d6fd09fc9907 Author: Gleb Smirnoff AuthorDate: 2025-01-29 17:05:57 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-29 23:48:55 +0000 netlink: use u_int as argument for ifnet_byindex() --- sys/netlink/netlink_message_parser.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/sys/netlink/netlink_message_parser.c b/sys/netlink/netlink_message_parser.c index 368cb43cf496..4a35440c50e0 100644 --- a/sys/netlink/netlink_message_parser.c +++ b/sys/netlink/netlink_message_parser.c @@ -420,12 +420,15 @@ static int nlattr_get_ifp_internal(struct nlattr *nla, struct nl_pstate *npt, void *target, bool zero_ok) { + struct ifnet *ifp; + u_int ifindex; + if (__predict_false(NLA_DATA_LEN(nla) != sizeof(uint32_t))) { NLMSG_REPORT_ERR_MSG(npt, "nla type %d size(%u) is not uint32", nla->nla_type, NLA_DATA_LEN(nla)); return (EINVAL); } - uint32_t ifindex = *((const uint32_t *)NLA_DATA_CONST(nla)); + ifindex = *((const u_int *)NLA_DATA_CONST(nla)); if (ifindex == 0 && zero_ok) { *((struct ifnet **)target) = NULL; @@ -434,7 +437,7 @@ nlattr_get_ifp_internal(struct nlattr *nla, struct nl_pstate *npt, NET_EPOCH_ASSERT(); - struct ifnet *ifp = ifnet_byindex(ifindex); + ifp = ifnet_byindex(ifindex); if (__predict_false(ifp == NULL)) { NLMSG_REPORT_ERR_MSG(npt, "nla type %d: ifindex %u invalid", nla->nla_type, ifindex); @@ -562,11 +565,13 @@ nlattr_get_nested_ptr(struct nlattr *nla, struct nl_pstate *npt, int nlf_get_ifp(void *src, struct nl_pstate *npt, void *target) { - int ifindex = *((const int *)src); + struct ifnet *ifp; + u_int ifindex; NET_EPOCH_ASSERT(); - struct ifnet *ifp = ifnet_byindex(ifindex); + ifindex = *((const u_int *)src); + ifp = ifnet_byindex(ifindex); if (ifp == NULL) { NL_LOG(LOG_DEBUG, "ifindex %u invalid", ifindex); return (ENOENT); @@ -579,11 +584,13 @@ nlf_get_ifp(void *src, struct nl_pstate *npt, void *target) int nlf_get_ifpz(void *src, struct nl_pstate *npt, void *target) { - int ifindex = *((const int *)src); + struct ifnet *ifp; + u_int ifindex; NET_EPOCH_ASSERT(); - struct ifnet *ifp = ifnet_byindex(ifindex); + ifindex = *((const u_int *)src); + ifp = ifnet_byindex(ifindex); if (ifindex != 0 && ifp == NULL) { NL_LOG(LOG_DEBUG, "ifindex %u invalid", ifindex); return (ENOENT);