From nobody Mon Sep 18 18:13:02 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 4RqCZl14bmz4tYV6; Mon, 18 Sep 2023 18:13:03 +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 4RqCZl0ZG0z3cC7; Mon, 18 Sep 2023 18:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695060783; 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=4shHBlS+pWyujTi+6qEeS9qY+6C+dGe0CyHGs7v/4j8=; b=qkCGHESIhzCqWwSMx6KSdYHLFECWM9fl4OkX8EBGMk/+Sb6guFPWVK86ATfVBbqf4cd3oA 3nSRpTMcBaWVA+lbSJxXdHBaIc+S3etuLdV090yXpwpbW26ywety2GJpqu0yJRAQ73jWb/ BzZL4JRQfuhDVfwClOkDEh3uw74HxM0olUrB7LI/zwtf7CU54ssARtZ5XcvnsAs3BI78W2 +75VQTZnfV6KxYbueDyyHLhaCZkvUt5YRBANfwBIEhjMqrIDIZtxj+Nl8yUWkJy9U8ummA 5PIm/2M2dahheh3Bw9lRxf2vQ0aC3Y5FOKpaMFUc/SQtbWMVB0F5FsRQ9rIWow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695060783; a=rsa-sha256; cv=none; b=sxsbLpfW/ObPRdAE/ogajcb0XtGuHTohDYTRaJTKNnSLYNYMS69O88J9bAFNmx/XTwk2/z f7U+d8Qrvei7mBJF/zl/BoFfLfLTjNZCcEqm9vri29TBbWvvIakNaNuaXzBAd9yZkR21PZ IGMnXcqx3di8TFVUOCYhTaS5FPlWDoA2itGSNcgte07xISkgaGGus6hnMM+VzQKH2PQJQx uLVqBcxCz8iym2UV5kqx56jGX5EaunWT8rDw9lmmYSlRFt1WQpw+DaA5CthNyRXTVocmdg IOnCCIaOuOW989G1P7DdU7jrz1SuaL0cUqf2uD3+6QD/otyJhEEdwWzJ4K3cAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695060783; 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=4shHBlS+pWyujTi+6qEeS9qY+6C+dGe0CyHGs7v/4j8=; b=il1DuftGCDRrxgz2hWybNhT5sXSgnlYFMbSojd9CoUOHIw42Lm9trAm3lydAhKznqvS5cU +GmuBFXjRhDIY3zzzxACKcb4N6sr9pdPElBefDcvUeQBh+O00XsKT+hv3iHUi3wGxHJGGJ mqf+FFmtQkS8WVJBGL4UEo/xOWAfQNRb3SWDrHcnb/LrlCkBcEKxhfYs/wR0gbkMyn96vq UaGcUxrs3B8f+gs9kKMuQKYrcxCpuPPAwfdw0gw/xYCToupVUvO9aJgWVK7aqfeqb0AJEx HG9AGvawE4ZsSXifb2ioPfJuLk25oirPTkZyAcg5owciQyDznOuR7Ql4PeTQlQ== 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 4RqCZk6lhXzh5W; Mon, 18 Sep 2023 18:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IID2H2078304; Mon, 18 Sep 2023 18:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IID2Ov078301; Mon, 18 Sep 2023 18:13:02 GMT (envelope-from git) Date: Mon, 18 Sep 2023 18:13:02 GMT Message-Id: <202309181813.38IID2Ov078301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: b57df6fbcc48 - main - ndp: cope with unresolved neighbours 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b57df6fbcc484f1941bf306cb60a3adaf538df69 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b57df6fbcc484f1941bf306cb60a3adaf538df69 commit b57df6fbcc484f1941bf306cb60a3adaf538df69 Author: Kristof Provost AuthorDate: 2023-09-18 17:01:17 +0000 Commit: Kristof Provost CommitDate: 2023-09-18 18:12:45 +0000 ndp: cope with unresolved neighbours If we've not (yet) resolved a neighbour nda_lladdr will be NULL, and NLA_DATA_LEN(neigh->nda_lladdr) will dereference a NULL pointer. Avoid that by checking nda_lladdr first, and only dereferencing if it's not NULL. Test case: ping6 -c 1 ndp -a Reviewed by: melifaro MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41903 --- usr.sbin/ndp/ndp_netlink.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c index ace3e5e5fa11..954d16995b5a 100644 --- a/usr.sbin/ndp/ndp_netlink.c +++ b/usr.sbin/ndp/ndp_netlink.c @@ -230,9 +230,12 @@ print_entry(struct snl_parsed_neigh *neigh, struct snl_parsed_link_simple *link) .sdl_family = AF_LINK, .sdl_type = link->ifi_type, .sdl_len = sizeof(struct sockaddr_dl), - .sdl_alen = NLA_DATA_LEN(neigh->nda_lladdr), }; - memcpy(sdl.sdl_data, NLA_DATA(neigh->nda_lladdr), sdl.sdl_alen); + + if (neigh->nda_lladdr) { + sdl.sdl_alen = NLA_DATA_LEN(neigh->nda_lladdr), + memcpy(sdl.sdl_data, NLA_DATA(neigh->nda_lladdr), sdl.sdl_alen); + } addrwidth = strlen(host_buf); if (addrwidth < W_ADDR)