From nobody Mon Mar 6 18:12:05 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 4PVmr609kKz3wCZ7; Mon, 6 Mar 2023 18:12:06 +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 4PVmr56rpNz4C94; Mon, 6 Mar 2023 18:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678126326; 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=KLFB8uwjmN7jnEirk98vPjCx9yaZ70QDJa6ZjpIgH1o=; b=vjNXPo/yq4m/9U1yYMEES3nEBAmsDMdqOiy/9QoLFQ/4bXX0tcVPHFdKV1m7nt3GYzd8jL DnyjL/Hg3LF3YPNTm+DV2tgPl7qQykthjI08LANFVJV469ylsDpMOWfSfI6vpNtNS8BRqk GzLCSxe1dtM4WcOHrKoeFvzPeV2AseZWtwfO149sF1iXNcf/SYtedvReoSJHnWIWZFK4ih d0OFVirJRY/7DtV5HOWvvUwdMQaFhRqaB2ugy6iZXK/E29BqxDeZTrLP0NcuExQ5ipJ1E6 X9h+Oje48/74ADpZgah83BNM7+gEwOckYnq49nCGm2Z4o9+q2rSW4S2cP1wjUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678126326; 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=KLFB8uwjmN7jnEirk98vPjCx9yaZ70QDJa6ZjpIgH1o=; b=X8XrGlqiNnFZTpioNYthf/VqH+p2X77ycE/H6KR4xGOd7kzLt+r1a023PmaeJ2lzobXikH +LyLMpCG81SJ5P0uAhUl5dMW8M60MTZObm0yK22Zwl7hW8c3/HKnGPTGOK5M4PmW1RejOU Mj8zr0irE967Qrmd/ofonJ/UVFVkMpZvcALcbfqGhwX2zBONFr2s1oIJ0976Oqb3QcaRhr GpIAA4ZTmky01Bq9K+c8BsgVtDVUJb8puxlfV651dfEs0DDbnWHPZAxwCQXcmFlaVHlgFC M/9AgD3jJwqh+9N1vYNf4btsZysGNAEu0/WMJtLPOBK2k4nxnxAEwbf54qneTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678126326; a=rsa-sha256; cv=none; b=tZIghUGMBAXi+QpWCABKe7sD9FsW3jqp8qoVhi40rDtSbUlSm9WEV56B+WQZO89+cUtmML htsrYtH5fD+axThCI+3KLx29umK/U8Gi3BZC9r51qCX6bAsDEZngpafAib2oJfDWNvBOCj VqEq9wxqLMoZ6ot1MyiOCjrSBwisYQGl8NcwHpQNWH/bYCSTWOODkMb6SLVy7wgiXJqI3G buk9Lhh8xB4AsGE3nqzKT5ydA8HNad8hoTP4lzAKrGP701TwNbs7K7ux4v90UmR9jMqsco PBOesvGtVSkzuWNGh115g4FYNoc13Z/FDkBgAiKjrsDNQhx517od4FOU2dc55Q== 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 4PVmr55vpNz19v4; Mon, 6 Mar 2023 18:12:05 +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 326IC50H087721; Mon, 6 Mar 2023 18:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326IC5ga087720; Mon, 6 Mar 2023 18:12:05 GMT (envelope-from git) Date: Mon, 6 Mar 2023 18:12:05 GMT Message-Id: <202303061812.326IC5ga087720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 305aaa93e0c8 - stable/13 - netlink: do not memcpy 0 bytes from a NULL pointer 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 305aaa93e0c805294c8bcbb5fe8b9f7caa28b349 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=305aaa93e0c805294c8bcbb5fe8b9f7caa28b349 commit 305aaa93e0c805294c8bcbb5fe8b9f7caa28b349 Author: Ed Maste AuthorDate: 2023-03-06 16:30:26 +0000 Commit: Ed Maste CommitDate: 2023-03-06 18:10:29 +0000 netlink: do not memcpy 0 bytes from a NULL pointer Although it works in practice it is UB, and might break after a future compiler update. This was rewritten in main and the memcpy call no longer exists, so this is a direct commit to stable/13 before 055776c84a41 is MFC'd. Discussed with: melifaro Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38927 --- sys/netlink/route/iface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 96f21a79a369..3ddef06bed7e 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -458,8 +458,11 @@ rtnl_handle_getlink(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n error = ENOMEM; break; } - memcpy(new_array, match_array, offset * sizeof(void *)); - free(match_array, M_TEMP); + if (match_array != NULL) { + memcpy(new_array, match_array, + offset * sizeof(void *)); + free(match_array, M_TEMP); + } match_array = new_array; }