D56342.diff
No OneTemporary
Actions

Size

641 B

Referenced Files

None

Subscribers

None

D56342.diff
View Options

	diff --git a/sys/contrib/libnv/nvlist.c b/sys/contrib/libnv/nvlist.c
	--- a/sys/contrib/libnv/nvlist.c
	+++ b/sys/contrib/libnv/nvlist.c
	@@ -1027,10 +1027,6 @@
	nvlist_check_header(struct nvlist_header *nvlhdrp)
	{

	- if (nvlhdrp->nvlh_size > SIZE_MAX - sizeof(*nvlhdrp)) {
	- ERRNO_SET(EINVAL);
	- return (false);
	- }
	if (nvlhdrp->nvlh_magic != NVLIST_HEADER_MAGIC) {
	ERRNO_SET(EINVAL);
	return (false);
	@@ -1050,6 +1046,11 @@
	nvlhdrp->nvlh_descriptors = be64toh(nvlhdrp->nvlh_descriptors);
	}
	#endif
	+ if (nvlhdrp->nvlh_size > SIZE_MAX - sizeof(*nvlhdrp)) {
	+ ERRNO_SET(EINVAL);
	+ return (false);
	+ }
	+
	return (true);
	}