From nobody Fri Sep 20 22:40:20 2024 X-Original-To: dev-commits-src-main@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 4X9S5K1tfbz5Xb7B; Fri, 20 Sep 2024 22:40:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X9S5K0Jj1z573C; Fri, 20 Sep 2024 22:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726872021; 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=iDq0I3BkQQIteZ34BuTx6D+Iz+YHl/eP/Sv5LnVDGGY=; b=cWmbOHQs6EPJhLQb+a8PCsc+M5JnOUympqFH1xw43kAYBhmxS7nXRywrlLsqMB3bFjzBy2 YWsuFdnvThl8Yt6KYLeXclOrkxTsVUU73IWJA5XJsI9HbmuTD+sV+YH+MxNSgb1L1OrLBZ CSuj8FK7ct9QxDFAFRwdkBMA1ii2XzLkInxC7zQ/bicaTA0VlUlDAuclKd+hNaRRJ3EKK/ CY1qE5lcEeog0JySTRn1t+2gnAr87P1uDJGbWQB96eQpzdM1gQfF9XOWV+IBtrnB4RiyX+ MBhrlAE0ccBsGju3gH0MJuKrYYSNtAZe2wmY02kdubQ9Tf/u7SFJ1fkWs3UyRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726872021; a=rsa-sha256; cv=none; b=Tvq2qDMZuZTgtcRSwsWduPncnLIJFbGrpE9NiPHn0kee8InoP2W0jxG31Wdtmyn9JN0htb FNIhq67t2KETvfsFWCocx9zOXO1QNkwQhHrfJEJbk5rNyQdsC3faHwYkqBNZomSqZIlk+1 PlHCWqaUT49IxuOjxDAQgNZ6t5XwSMl2Thl8TSZ8Ie82dmkj4YYlK6XZ8EK3dp9xP3C7uW fq6nG8bILwEaVt2y8c/0MujFU/DaQGWKuNEaFKRrYykZmROAYONED7lUBwlLQH46OXxcfM 4rr1Ai777D3dSXQFZCEXYj6eMkLUIbghiTWVXr/lTj85BXXi6nboKFvbvZIsoQ== 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=1726872021; 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=iDq0I3BkQQIteZ34BuTx6D+Iz+YHl/eP/Sv5LnVDGGY=; b=twd456Nd4N3U9Yh+Up5gZoA/2MVpNB4teXZICUwldbfkfDKaljB4k3q4bQugEgfepjX0g4 anIWelZzQ5v+KYL1VxEmmDqW4q311oyYMpzyBzmJkYQQrWgwnd3Vn2C96fRBOCS0QBVw2K Pdgrs1/DpwBXbLFZ2dbpWVScrveHgggOVpfJjfbsrh0oQvDqCCfzzTIBx07Dk83++xU+V4 MvjrKZmwRYEd6f/d009TeCFUvHZoYuzp6HU0zEcU9BoVZ3/ywCRU93XmDLCxZ+ysZJsjY0 uOHlIgC7Gvgir3t1Ag5GQQFjuHaC0CwdMoIKDwuiKDSRwtT4RN3gjJ1cGXM7tg== 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 4X9S5J5xdHz17PK; Fri, 20 Sep 2024 22:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48KMeKwh040398; Fri, 20 Sep 2024 22:40:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KMeKXf040395; Fri, 20 Sep 2024 22:40:20 GMT (envelope-from git) Date: Fri, 20 Sep 2024 22:40:20 GMT Message-Id: <202409202240.48KMeKXf040395@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c6ad7dcd9c44 - main - mfiutil: Fix incorrect accesses of an union member in 'struct mfi_evt_detail' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6ad7dcd9c44a49078841e9ec42bf8621ae312c7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c6ad7dcd9c44a49078841e9ec42bf8621ae312c7 commit c6ad7dcd9c44a49078841e9ec42bf8621ae312c7 Author: WHR AuthorDate: 2024-09-03 04:44:48 +0000 Commit: Warner Losh CommitDate: 2024-09-20 22:22:44 +0000 mfiutil: Fix incorrect accesses of an union member in 'struct mfi_evt_detail' PR: 281156 Reviewed by: imp, delphij Pull Request: https://github.com/freebsd/freebsd-src/pull/1402 --- usr.sbin/mfiutil/mfi_evt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/mfiutil/mfi_evt.c b/usr.sbin/mfiutil/mfi_evt.c index 9f6c0c2246ca..d4eb48d9dcb4 100644 --- a/usr.sbin/mfiutil/mfi_evt.c +++ b/usr.sbin/mfiutil/mfi_evt.c @@ -395,7 +395,7 @@ mfi_decode_evt(int fd, struct mfi_evt_detail *detail, int verbose) printf(": "); break; case MR_EVT_ARGS_LD_LBA: - printf("VOL %s", volume_name(fd, &detail->args.ld_count.ld)); + printf("VOL %s", volume_name(fd, &detail->args.ld_lba.ld)); if (verbose) { printf(" lba %lld", (long long)detail->args.ld_lba.lba); @@ -403,7 +403,7 @@ mfi_decode_evt(int fd, struct mfi_evt_detail *detail, int verbose) printf(": "); break; case MR_EVT_ARGS_LD_OWNER: - printf("VOL %s", volume_name(fd, &detail->args.ld_count.ld)); + printf("VOL %s", volume_name(fd, &detail->args.ld_owner.ld)); if (verbose) { printf(" owner changed: prior %d, new %d", detail->args.ld_owner.pre_owner, @@ -412,7 +412,7 @@ mfi_decode_evt(int fd, struct mfi_evt_detail *detail, int verbose) printf(": "); break; case MR_EVT_ARGS_LD_LBA_PD_LBA: - printf("VOL %s", volume_name(fd, &detail->args.ld_count.ld)); + printf("VOL %s", volume_name(fd, &detail->args.ld_lba_pd_lba.ld)); if (verbose) { printf(" lba %lld, physical drive PD %s lba %lld", (long long)detail->args.ld_lba_pd_lba.ld_lba, @@ -431,7 +431,7 @@ mfi_decode_evt(int fd, struct mfi_evt_detail *detail, int verbose) printf(": "); break; case MR_EVT_ARGS_LD_STATE: - printf("VOL %s", volume_name(fd, &detail->args.ld_prog.ld)); + printf("VOL %s", volume_name(fd, &detail->args.ld_state.ld)); if (verbose) { printf(" state prior %s new %s", mfi_ldstate(detail->args.ld_state.prev_state), @@ -486,7 +486,7 @@ mfi_decode_evt(int fd, struct mfi_evt_detail *detail, int verbose) case MR_EVT_ARGS_PD_STATE: if (verbose) { printf("PD %s state prior %s new %s: ", - pdrive_location(&detail->args.pd_prog.pd), + pdrive_location(&detail->args.pd_state.pd), mfi_pdstate(detail->args.pd_state.prev_state), mfi_pdstate(detail->args.pd_state.new_state)); }