From nobody Mon Feb 20 20:13:07 2023 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 4PLDBD05KNz3s6lP; Mon, 20 Feb 2023 20:13: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 4PLDBC6bQMz3L0Z; Mon, 20 Feb 2023 20:13:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676923987; 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=GwzThnnVSw3dTLv53Rz+D58XBSSSpGZTymK8eOyBFAQ=; b=AkTJrJX8vbXxW/JCz1gOg8YkFuVAdsTq4ebVAdy6sAILkY+NzgkGDX7IC0HcinvXT1Vn+i CSx1V1C5S08XkHLbmrJbs4fLJRi0+ZwOJLrZIZ/ejthEXe5V8Q0be/goPCnN4zX/6hOzQb Jr6A4EzJwikzWo8RpXngBr4hXzuhiELbtFUcoDIHcujwtubFLObu9IW4xUGjCNQYg5YSGq 5/DiFVpEc/DBRtHExTusPz6je/fLnNj5V0CpJc5qMg87DWmoct1kfHNhs+z4mg29Hc2+vl rOC5BO4FrhYniE9ZE8YuloMAsCB0kPi5u/wOs11ALEscRHoNBi7NofOmebM78A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676923987; 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=GwzThnnVSw3dTLv53Rz+D58XBSSSpGZTymK8eOyBFAQ=; b=Ujug6fz67uJFeAZbQSq4voonKACoKxEViadeR+GrbzAInAvvKHxPukFUGulLdYv/YUqShn n+1JYgFmj70Mivnx4movpJjWvFWrEnRqpZyYyoNGAsOkXsZo56WagCiSuZ4fBtdCRUvWV0 SJ6tsCRDukJKUl/OEOv9SbvWLFDsvPNsO6HmuUOD7Nw/4velV48XyGlNZbilJkt4QQQhrE 7OxtmKOBMwTRh0sr3G29iub5Ra+9+Xd9FWy+OEqf3/RSaqyn1HllOzuTQZSnl+10BwEcFB +WTzox9a3lgnMl0yzgRTWAllwtlX4z88ylvk2W27IE8OoFX+pHSwN5Y9lsdzcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676923987; a=rsa-sha256; cv=none; b=aJMWckmJ5js7r6hg3ZbUxSdd+DrYPRkrP8i60i2R7G48B5pcxrphKxvPnDfhGLM1wnZ97f i7jUUHnoC11TEhkmOTsktbogAL6j0FqaT1C3sXpEO4cM2Ze43S/TdCPPOep9MdByiFClT7 GWp/4IAK7Y0vW5l+OT4wJ52CMnGhY/B8n3CflmqM0Ffb9lJxXQBOQnNJnkf/TwEAfQ2Wl5 zY/SrUlUBtOCPFUba8Lqq+U1wlr8zG/4IEQ+z3k5+yGzYMR2+Aw27NqkHHWqjPrAqKLN+c +5cm1XJWOHIeBXTVA7TztsqZWK15gWUigCiq4Ln1z5qMmprEUmHK8QEwFepBCw== 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 4PLDBC5hMHztQ8; Mon, 20 Feb 2023 20:13: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 31KKD72s094088; Mon, 20 Feb 2023 20:13:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KKD7aF094087; Mon, 20 Feb 2023 20:13:07 GMT (envelope-from git) Date: Mon, 20 Feb 2023 20:13:07 GMT Message-Id: <202302202013.31KKD7aF094087@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: 816aebf69c3d - releng/13.2 - netlink: fix if_allocdescr() malloc options argument. 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 816aebf69c3dfabef3e9d7fca799438fcd5760ad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=816aebf69c3dfabef3e9d7fca799438fcd5760ad commit 816aebf69c3dfabef3e9d7fca799438fcd5760ad Author: Alexander V. Chernikov AuthorDate: 2023-02-17 17:35:28 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-20 19:48:22 +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 Approved by: re(cperciva) (cherry picked from commit 6694cb1f5784d6ceacd684d29b3e3012e1e4e4d5) (cherry picked from commit 8c60d469d3faa98f6b0e49173f16a8603c4c4654) --- 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 7f098b808743..1b8c27bfca68 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);