From nobody Thu Dec 1 11:32:07 2022 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 4NNDSS0GsDz4hvZ4; Thu, 1 Dec 2022 11:32:08 +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 4NNDSR6xkFz3Lhg; Thu, 1 Dec 2022 11:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669894328; 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=44MhbM6tMmyLX4Od/ZFyWi7BGwSBMlYf7VRvmsYF30M=; b=VAUZu3OxZTCp0uR1EBqzV8JCzKQ18t8JJfz/z2jTI49f+yOlW+ZbVyBlR6FLPXT0QGVQ8n n+2sZMcLrNrHH9hAwlcDmnylt4J4nqvsyXW2w4kKCgmWqG/TRGBi2VQO66zjhigV5Zz65G fxhAH7dasXG8cbg0Mxme5THh4MC+Ku+nG+U6qRRg2CA0FPuZNMfSg4XpxHVKIDYfGga+tb lvDZAXCC++liAoa6qElpYCw9arXiBKpuEZyiwGCn9/D0LcdwyyJ1lzhsrbfV3JVnULMjAK 6aKfctw9BtsyG08VmJpRb+HNncgxIIDCXJNO5h/RO1ERK+Z5K3x43RUkQ4I7pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669894328; 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=44MhbM6tMmyLX4Od/ZFyWi7BGwSBMlYf7VRvmsYF30M=; b=bD6My+pT2cXbvtUI9Rc1qMEBg4TfUC1kRpNjIB6UzE6ZxKhlDj2U1fFecCDrGN0eLWNqxm nDlnlZN3aVN0+6CvoOeeg1K0DuwTA9M3/t0TfkDMmQk9tuHJhJBQj04e4jS8WuXz6gd3Dj K4vHXedj3PSMh7pCMCEJTof95ACJsM32X04DeBYTnnP/zlAa/o29fQ3nLTGXlyFTEq881s ITW1NptSOOB0MIduRLFREIi/g9LkydHPr7C+Cupo5QyOUsHx0yCHv+RkMXjG1EbIZUjC9+ dIVW7B38mUCPUHsXrOJ5YEowSy+HhF4MwgV8pPr30p1B/58lkUarMCqhqSgfTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669894328; a=rsa-sha256; cv=none; b=v4/2LunHafkKGGteegQ7rWy4WlVnbfslmIdKby8icEmwW4PQz/4tetPTgP8TOEk8nDniv9 /ZA4IS0Y4hcVd+P+w9a44JkGcV9VRVoDszOpb8OcuAETQDHWC5PMMNV4y9dk+kfJLQM4kz msF8qckCbeadVPu7snUwRSWDA2w4ObkppGG9MfKwf/MOBVGgwXCmSk+hjx1ahxvYpug4Sc imNIMkkczVAFSfvn/f1ipyMguLJ095YikSLZcbiU/Zj2HHXAUPxyi0mDYpOyagXTftMYxu oWy8eoTebyuAyRTHFjvgwc6/gU7mxi2xYuEXtMsXlkQeRiCK8OwMFq/h6A5Sig== 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 4NNDSR62FgzbQZ; Thu, 1 Dec 2022 11:32:07 +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 2B1BW7gc036581; Thu, 1 Dec 2022 11:32:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B1BW7A4036580; Thu, 1 Dec 2022 11:32:07 GMT (envelope-from git) Date: Thu, 1 Dec 2022 11:32:07 GMT Message-Id: <202212011132.2B1BW7A4036580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 984b27d879e1 - main - net: add if_allocdescr() to permit updating iface description from the kernel 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 984b27d879e14d88834ddfb7b9f9a4c40a84c492 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=984b27d879e14d88834ddfb7b9f9a4c40a84c492 commit 984b27d879e14d88834ddfb7b9f9a4c40a84c492 Author: Alexander V. Chernikov AuthorDate: 2022-11-30 13:49:07 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-12-01 11:31:36 +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 --- 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 7446fb492436..8333c85b5eb1 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2610,8 +2610,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) { @@ -4273,6 +4272,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 ce36beadcfd5..859abf8fc089 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -740,6 +740,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);