From nobody Mon Jan 23 22:12:29 2023 X-Original-To: dev-commits-src-branches@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 4P148s3gSfz2t19y; Mon, 23 Jan 2023 22:12:29 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P148s3C1xz3N9y; Mon, 23 Jan 2023 22:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511949; 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=OpjCmYnowQ5ZX86JrIWQbdtg+BylS/hk1H4/BtfjhKY=; b=CckI5sbOb+2tk8bMHUBd8UOC9NNxuklR+rIzGgP6p1VRF27t2ILkryWoi3w5TJJv7b4PFz Aq/YV/sVlGhkINLIV1l89lNDzJ5JevmQAy5IeOxkxs/SwM8jbVHOB8W2UiW6zWLTlb6yhZ dvzPhiXa4QbMAuY/YEjmaxSouicEYr0G8OZd9D4Z30u1em7OFABQjicFEOlx4+1x0ozIwn gQa1S9PmVj5EhtxJS7MJRPaIIjuklassLX6HtbWZCzp7wfFHobbPeUqvWYsLlb2qse8qmi 82thQlNKtv92xfC0HAa3f7tCVdNdRsAamgdFq1PEVn6l2aDmbnaZvGh1TxhxOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511949; 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=OpjCmYnowQ5ZX86JrIWQbdtg+BylS/hk1H4/BtfjhKY=; b=mfoYBOsmvgHvHwUDXLkeJ8kdRIH7oGCW7p/K7dDKP7aRfHOl2VUbbqF6JGTI1gVRo8/TXm YgvP08QEJFvOvDyu0CpUCOJ4K2Xvz8OoWLIoblG6TOCw5+yhXJXFtrORrfQQQauiTyfRf9 gkgk2+8j1fczCHlrVrZuhFFhn1OEqktqLLkHh0KTnvqt4uGXgkPdzDTX7F15HMD3lAHsxs 7J3H3Nb2Hj2bMZMzsHdejf/kONsib6TkXBtyRTosOjTVw7R0xF/Gf1Jyz+Q6O9dC6NweMm oazXVmLCciAgo01fzssNPix2J0GWkYpFxdk/wjK1xsPZ2qJ+yqBuMBVh0p6oRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511949; a=rsa-sha256; cv=none; b=OHUYpTSg7W37getxNxN8A/+tQkb52VR9hByY6QNmutq+VUdqst2tcCwu4K5I+0Kw4YAQDD wGEu4YwhxVglOdETMd1+P/GJjIZfrKBcz7GnGkRmiZIOob5PF28p83ufIjA7kzPhyFHQN8 0hqdQP1mzRssSDp0K220pF2B35vKe+vsp71tntBp7/Ce2yml9fMejr8ZwrQF0T2Ij/ftpi 0J5ifsqoQm/lRi08DT3M+cWZVI1LGM+QxCauztrYbZF2tAsyVhUHtPDYN8FJDN5BbPVCF8 LYhozYxWJWzvPSvBg7lDhf0W95UWchET7vInnqtfsItcqSYfAdUaxXQnV0dNmg== 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 4P148s2B9gzltv; Mon, 23 Jan 2023 22:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30NMCT6c017526; Mon, 23 Jan 2023 22:12:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMCTEM017525; Mon, 23 Jan 2023 22:12:29 GMT (envelope-from git) Date: Mon, 23 Jan 2023 22:12:29 GMT Message-Id: <202301232212.30NMCTEM017525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 40c711523e3a - stable/13 - net: add if_allocdescr() to permit updating iface description from the kernel List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 40c711523e3ae6323294c2a1ec8285e494a338da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=40c711523e3ae6323294c2a1ec8285e494a338da commit 40c711523e3ae6323294c2a1ec8285e494a338da Author: Alexander V. Chernikov AuthorDate: 2022-11-30 13:49:07 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 22:10:07 +0000 net: add if_allocdescr() to permit updating iface description from the kernel Reviewed by: kp,zlei Differential Revision: https://reviews.freebsd.org/D37566 MFC after: 2 weeks (cherry picked from commit 984b27d879e14d88834ddfb7b9f9a4c40a84c492) --- sys/net/if.c | 10 ++++++++-- sys/net/if_var.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 813525c2e7bd..4df376cbc7a6 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2573,8 +2573,7 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) else if (ifr_buffer_get_length(ifr) == 0) descrbuf = NULL; else { - descrbuf = malloc(ifr_buffer_get_length(ifr), - M_IFDESCR, M_WAITOK | M_ZERO); + descrbuf = if_allocdescr(ifr_buffer_get_length(ifr), M_WAITOK); error = copyin(ifr_buffer_get_buffer(ifr), descrbuf, ifr_buffer_get_length(ifr) - 1); if (error) { @@ -4163,6 +4162,13 @@ if_setdescr(if_t ifp, char *descrbuf) if_freedescr(odescrbuf); } +char * +if_allocdescr(size_t sz, int malloc_flag) +{ + malloc_flag &= (M_WAITOK | M_NOWAIT); + return (malloc(sz, M_IFDESCR, M_ZERO | malloc_flag)); +} + void if_freedescr(char *descrbuf) { diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 6738f00a4f08..c0f7de44dc55 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -709,6 +709,7 @@ int if_setcapenablebit(if_t ifp, int setcap, int clearcap); int if_getcapenable(if_t ifp); const char *if_getdname(if_t ifp); void if_setdescr(if_t ifp, char *descrbuf); +char *if_allocdescr(size_t sz, int malloc_flag); void if_freedescr(char *descrbuf); int if_setdev(if_t ifp, void *dev); int if_setdrvflagbits(if_t ifp, int if_setflags, int clear_flags);