Attachment 235088 Details for Bug 264848 – proposed patch

[patch] proposed patch

diff (text/plain), 1.02 KB, created by Mark Johnston on 2022-07-05 16:37:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Johnston

Created: 2022-07-05 16:37:52 UTC

Size: 1.02 KB

patch

obsolete

>commit 3eac9bda39ea437c6611ef60f098e3f5d5a7f7f9
>Author: Mark Johnston <markj@FreeBSD.org>
>Date:   Tue Jul 5 11:13:06 2022 -0400
>
>    mpsutil: Make the version check more general
>    
>    PR:     264848
>
>diff --git a/usr.sbin/mpsutil/mps_cmd.c b/usr.sbin/mpsutil/mps_cmd.c
>index a9cb269abc5f..c086e25678bd 100644
>--- a/usr.sbin/mpsutil/mps_cmd.c
>+++ b/usr.sbin/mpsutil/mps_cmd.c
>@@ -730,6 +730,7 @@ mps_get_iocfacts(int fd)
> 	MPI2_IOC_FACTS_REQUEST req;
> 	char msgver[8], sysctlname[128];
> 	size_t len, factslen;
>+	unsigned int major, minor;
> 	int error;
> 
> 	snprintf(sysctlname, sizeof(sysctlname), "dev.%s.%d.msg_version",
>@@ -739,7 +740,12 @@ mps_get_iocfacts(int fd)
> 	len = sizeof(msgver);
> 	error = sysctlbyname(sysctlname, msgver, &len, NULL, 0);
> 	if (error == 0) {
>-		if (strncmp(msgver, "2.6", sizeof(msgver)) == 0)
>+		if (sscanf(msgver, "%u.%u", &major, &minor) != 2) {
>+			warnx("Invalid message version '%s'", msgver);
>+			errno = EINVAL;
>+			return (NULL);
>+		}
>+		if (major > 2 || (major == 2 && minor >= 6))
> 			factslen += 4;
> 	}
>

Actions: View | Diff

Attachments on bug 264848: 234887 | 235088