From nobody Wed May 03 00:29:45 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 4Q9yWY4yQGz48N8M; Wed, 3 May 2023 00:29: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 4Q9yWY4M1wz3mZB; Wed, 3 May 2023 00:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683073785; 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=lfIHvyeBqNEa3gkRNVzHDy7QO8FqKC8/iBRkhhvPhRc=; b=lKkbYZFumTjjZIsqGgK+e7zxJXOYAL8r6IxgzKpRTnyoYQfGpAc+hNnrsb11y0Y4elisP/ Au9hjLa4Q9I8wj9XhvAfiWdiwfrRl0QEKZziUsAziQsyo4+njUx12lMQYlJgpt5Q7MgjJT W2zA+3dtqBiouzzyHOWNFN4sIXDKK3XhplFaBiBl3Lm6Z8GJhtbDhXpc+JBKgSL7ziiEGk 3duDQ0tJZ2o5OfqeLJpN6PfLMOfJxmpIXTu7aWu9XLGWwD11RSkWKYNjE7dGhHMjEBs4lx f6Cjym7mwlUBF4Ie/24ZLO31+B+qvghi2ErvuNYcZMraXUE2tcZFphuVBdpVog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683073785; 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=lfIHvyeBqNEa3gkRNVzHDy7QO8FqKC8/iBRkhhvPhRc=; b=XZWD2kRmnAoG9A37sw4TgqBMQ9RlXiYEbtgO9cHV+9Zo/zZyV0VyuYx+3BB170ZRsazJcJ 8OwGp48um6XelluUYXbzSGvQlQEYrNdq4TpX1IWjh+nVzuDyMmhZ3lXFiV0L9UwUNa/0Su X7vd5pubVrBjVBadx7tIlYgIoZ4hwR9JJ4caa/IP4qX7LnwvIxsUwBwKlXPlWtlAJrUxZ/ XTXjdG/EXogoUOjvOq6CHxc6mZWlDn/j4qXKJPTsCASF6jcMQbXiMmPKcDFOH4AoL1DSBO e0kU0Fi4M2WuYkZYklPXQ9wFysGlPWquuLRZ8/2YcBYCahj44JdsMsGAztaxhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683073785; a=rsa-sha256; cv=none; b=QL29YbS3mzc6vEO1bQJbz7zwCbVsgg9kv4hGtndMPTQbJtQIrau4tn4jt82KWGoC31+VeA 9mMIzbs2aiA0ZrH6nEywkZzuZyB7rTcFLzCIGgT4JGjlYWCnt3hvKck+/GTCHJZvYs48Cf 2N/EjzdD4Ea4YF/AKMMlCwo8NRzxtWJTDNxdy8b4wCZXRFP1Or/5txMGeIyUJ0+dR25idI cde2N7S4emUC2QUNxTYKcAIrkASSmdWkAk1XzkGjemeACRF8A8HWNzKXOkuRNBtS+R0Hx8 oGjxgJmYK4omxf4RlZ8hcsR5BZiNwN3HqD8/k7v5NXsCi7bVva/q/iZ2g82isg== 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 4Q9yWY3SWnz18TK; Wed, 3 May 2023 00:29: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 3430Tjoj072115; Wed, 3 May 2023 00:29:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3430TjEL072114; Wed, 3 May 2023 00:29:45 GMT (envelope-from git) Date: Wed, 3 May 2023 00:29:45 GMT Message-Id: <202305030029.3430TjEL072114@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 64313140e531 - stable/13 - iee80211_hwmp: Don't dereference NULL ni in debug printf. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 64313140e531622eaa5e858e8d22c663efb83d19 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=64313140e531622eaa5e858e8d22c663efb83d19 commit 64313140e531622eaa5e858e8d22c663efb83d19 Author: John Baldwin AuthorDate: 2022-12-21 18:45:45 +0000 Commit: John Baldwin CommitDate: 2023-05-03 00:12:50 +0000 iee80211_hwmp: Don't dereference NULL ni in debug printf. In this call to IEEE80211_NOTE, ni is always NULL due to the assignment a few lines earlier at the start of the function. If debug traces are enabled, then this will pass an invalid pointer as the 'mac' pointer to ieee80211_note_mac. Use IEEE80211_DPRINTF which doesn't take a 'ni' argument instead. Reported by: GCC -Wstringop-overread Reviewed by: bz, emaste Differential Revision: https://reviews.freebsd.org/D37626 (cherry picked from commit 95d146592f5ee3fa998496713f28475e65996ff9) --- sys/net80211/ieee80211_hwmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_hwmp.c b/sys/net80211/ieee80211_hwmp.c index 77ba218ccd50..ad3de543664f 100644 --- a/sys/net80211/ieee80211_hwmp.c +++ b/sys/net80211/ieee80211_hwmp.c @@ -1928,8 +1928,8 @@ hwmp_discover(struct ieee80211vap *vap, if (rt == NULL) { rt = ieee80211_mesh_rt_add(vap, dest); if (rt == NULL) { - IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, - ni, "unable to add discovery path to %6D", + IEEE80211_DPRINTF(vap, IEEE80211_MSG_HWMP, + "unable to add discovery path to %6D", dest, ":"); vap->iv_stats.is_mesh_rtaddfailed++; goto done;