From nobody Fri Feb 17 18:16:45 2023 X-Original-To: dev-commits-src-main@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 4PJKlK2z7Rz3rGkp; Fri, 17 Feb 2023 18:16:45 +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 4PJKlK29Qfz3sXY; Fri, 17 Feb 2023 18:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676657805; 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=b/FG1gGOIFUgiIhIY1ucZPpt4EFUcRL4o5cI4aP8LRE=; b=opvFUDtdREfMJDcL/oKEWR84LwToVhrYHRq7pPhDuSkZtKsJ9vhqbjGO3S/kA1PII9T4iS TyfsJPTp8Whd4WA3VfORd9f/DDiaTAH/oB4xntlWbk5yx5embM/GhY8ohi56CNE5N5+7RK A4ySVUD/dHTcbmgSrt3nFfBzviuYzke2M+ZMO4Onpb7+BAnyg6tyQ9LnsSoVU/U3D/0jHy RMGju5QSh7ynA6o5sr3d9QOn+6WdhOpdDmyRaaeTPb5w2NCTmnpTNOUW8kZkxlMOsjD96J 01qLylA4mHd7N6xk5wE9m+9TPlpKoQfO66lGaKUQhEEKoE7PTL3GuLnqnqI+Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676657805; 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=b/FG1gGOIFUgiIhIY1ucZPpt4EFUcRL4o5cI4aP8LRE=; b=plyS3XfCFVWxb68u59wMsm5thfLtTAoAJKh6zbVLXCLGYQROejIgphY+fhLq3myFOSmybD L0UHe1dMeZrgSRODaL4mIiL+qlwOByU3r1g2iy/IhxOSr7mO5dvSwfHbg/dyHYwTwsTgZC kOJH0dV8D5p9bUEaJ2p/qCF/mGtHsU+j7VhGYyzYkp26ZMFgRUwPB8tbH9EljG6ccvmRnC OD+II24Fd51Gv1KTdU8//9IxAGYsikBRiipfqmSx2rV+Wip4ua5nvOiXOGuC+I/vIPo93A TpvaYn9nnP/3lP8yS94J6b4MsjKHudf3bc1RgTnOlPBf9BOa6CSJhT9UYKKnRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676657805; a=rsa-sha256; cv=none; b=sPTL1reOCOhlSmaE/rhSq4pRWk1eQ0FLk4t6wqt2H8J9HDjLIIYE0q6s4YotyO53io2DQy gKliGMwcwUFm4m7RnxBQ55iw6auwHmEAsnPejkXJfWpViDRSunix0tmPOdaWIX7PYXqBcd 2czf9ETVLtnybHM6XE/ir3ocufNeEdpJRSrRR9kZC8QxkbZBEAXYVlA4M6aWxNEyGbhOU5 2wOsaTqY/4g2jtekhRRWOUe2+lK8d4SucGvgDHhzSJ6TWmIo7zvAVTak7Okxs2wc6a6aL9 D+EqT8LP+EaR9U2Cie45g+0zmdWCxXB9JYWLYtb0SibJeG1UxLMmxuImKrv01g== 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 4PJKlK1HF5zrlp; Fri, 17 Feb 2023 18:16:45 +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 31HIGjIC054337; Fri, 17 Feb 2023 18:16:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31HIGj8U054336; Fri, 17 Feb 2023 18:16:45 GMT (envelope-from git) Date: Fri, 17 Feb 2023 18:16:45 GMT Message-Id: <202302171816.31HIGj8U054336@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: 6694cb1f5784 - main - netlink: fix if_allocdescr() malloc options argument. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 6694cb1f5784d6ceacd684d29b3e3012e1e4e4d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=6694cb1f5784d6ceacd684d29b3e3012e1e4e4d5 commit 6694cb1f5784d6ceacd684d29b3e3012e1e4e4d5 Author: Alexander V. Chernikov AuthorDate: 2023-02-17 17:35:28 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-17 18:00:37 +0000 netlink: fix if_allocdescr() malloc options argument. The current value was based on the initial revision of D37566 and was not updated afterwards. MFC after: 1 day --- sys/netlink/route/iface_drivers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c index e944fe88994e..7cfaa5a6614b 100644 --- a/sys/netlink/route/iface_drivers.c +++ b/sys/netlink/route/iface_drivers.c @@ -72,7 +72,7 @@ modify_generic(struct ifnet *ifp, struct nl_parsed_link *lattrs, if (lattrs->ifla_ifalias != NULL) { if (nlp_has_priv(nlp, PRIV_NET_SETIFDESCR)) { int len = strlen(lattrs->ifla_ifalias) + 1; - char *buf = if_allocdescr(len, true); + char *buf = if_allocdescr(len, M_WAITOK); memcpy(buf, lattrs->ifla_ifalias, len); if_setdescr(ifp, buf);