From nobody Sat Feb 18 12:12:18 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 4PJncL3Dw5z3s8WP; Sat, 18 Feb 2023 12:12:18 +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 4PJncL2WXwz3FgV; Sat, 18 Feb 2023 12:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676722338; 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=Iyk6KwFgIaLLRA/+L/pDsH9ZuKnx5TaI5CfpMMTgAyw=; b=gHCEorz9K+TamAqmHks+OVC5jikUyh23W2WW9Wlc3LoDxfztdZKeox6WLw5k2/3kcea4/A cXWyVp66NbfNpqcQuBgPG0lP5CAqE1aZB4YKOwmJ21nvI1upBN3kOtOnGq28+j3H53F0Ir LYB2HCNfRoCvm+siWBqea1l51DqfEJbKnFlJI0REnN/wSS5FcgXr3XxF6Um304d73vS6nU VgJkrBRECuqzXfd57mW0Ji6A9dE1Yg7VGrGreU7/QoHVvUNYUhLQ7GMszOsFiQrDQi18dl /MOjEUm0lnRMhHGMGIqpGMt/bFt3DBwvGbStPwSM5CEBRYMwzIaDdFKOPmLdEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676722338; 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=Iyk6KwFgIaLLRA/+L/pDsH9ZuKnx5TaI5CfpMMTgAyw=; b=UE/bkKELohn/6S27cZgzgWmB2m3PFHXiz6mn/kKmLIDrKAhiopIgSIKbpxvHlhXMB37sgE EGwXI32wFgsJd7oRP99E5EwiRgeYW0r6P8QOBBKTdL5miyar1tWxgP6M75L2XTUPM6RRkr 05wERMeBbVBCNcHlODtNFgSRpd3zC/sEc9lWv5SAT4Gs33dt6wi8BcboZrbuPTQq8WGuPT JRzv3bdYZ3G18JUwR6ENhfyTxXTgZNxJCSjLGi5AI1hGoJipBYcZj9xB0lvxasVWUUr59d ljn0AGq02lD4xa7TFGLFyHfK/g2KM7wrfx6E24aVkRjvyKG/NjPTCZgMB+yhWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676722338; a=rsa-sha256; cv=none; b=TjIw36KXIHg/q92wn5RNbRD8boqv0WSqOU4rVuAymjtm3AHTnZD+0fwzw06cA2UDCoFCRM WQWK1DK49SjSEUI/LILu3qzkAkTmmGLqCD+SpnqQkna5ydwUDnj2o8aH/jfKMYY4wWU15n +AkllOE+4ebYSii6P14TXXKAuVadrZ2WjzDhQvlvII6ILPMEMbuF6mwZLqBgTHw2GgQofl AQ2hOCx2MtyeSKU7GX8t6CgYVnzZMyyqw/LyfZ4WY2SRtjlKYhxPuQsYUHs8hPoliTFpP2 LIHJT28QZFEVzicDOgFu2Ile0OJh/POYdDnVwq86UCKESMyBYlU/FmAw8S6LVw== 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 4PJncL1bwfzMqv; Sat, 18 Feb 2023 12:12:18 +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 31ICCIcp097699; Sat, 18 Feb 2023 12:12:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31ICCI4w097698; Sat, 18 Feb 2023 12:12:18 GMT (envelope-from git) Date: Sat, 18 Feb 2023 12:12:18 GMT Message-Id: <202302181212.31ICCI4w097698@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: 8c60d469d3fa - stable/13 - netlink: fix if_allocdescr() malloc options argument. 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: 8c60d469d3faa98f6b0e49173f16a8603c4c4654 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=8c60d469d3faa98f6b0e49173f16a8603c4c4654 commit 8c60d469d3faa98f6b0e49173f16a8603c4c4654 Author: Alexander V. Chernikov AuthorDate: 2023-02-17 17:35:28 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-18 11:56:18 +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 (cherry picked from commit 6694cb1f5784d6ceacd684d29b3e3012e1e4e4d5) --- 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);