D38739.1775626561.diff
No OneTemporary
Actions

Size

899 B

Referenced Files

None

Subscribers

None

D38739.1775626561.diff
View Options

	diff --git a/usr.sbin/mpsutil/mps_cmd.c b/usr.sbin/mpsutil/mps_cmd.c
	--- a/usr.sbin/mpsutil/mps_cmd.c
	+++ b/usr.sbin/mpsutil/mps_cmd.c
	@@ -728,20 +728,14 @@
	{
	MPI2_IOC_FACTS_REPLY *facts;
	MPI2_IOC_FACTS_REQUEST req;
	- char msgver[8], sysctlname[128];
	- size_t len, factslen;
	+ size_t factslen;
	int error;

	- snprintf(sysctlname, sizeof(sysctlname), "dev.%s.%d.msg_version",
	- is_mps ? "mps" : "mpr", mps_unit);
	-
	- factslen = sizeof(MPI2_IOC_FACTS_REPLY);
	- len = sizeof(msgver);
	- error = sysctlbyname(sysctlname, msgver, &len, NULL, 0);
	- if (error == 0) {
	- if (strncmp(msgver, "2.6", sizeof(msgver)) == 0)
	- factslen += 4;
	- }
	+ /*
	+ * Depending on firmware version, the card may or may not return an
	+ * extra 4 bytes. Allocate enough storage for any firmware version.
	+ */
	+ factslen = sizeof(MPI2_IOC_FACTS_REPLY) + 4;

	facts = malloc(factslen);
	if (facts == NULL) {