Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Oct 2012 19:01:20 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r241274 - stable/9/sys/boot/zfs
Message-ID:  <201210061901.q96J1KhK021119@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Sat Oct  6 19:01:20 2012
New Revision: 241274
URL: http://svn.freebsd.org/changeset/base/241274

Log:
  MFC r240349: zfs boot: add a size check for a value in fzap_lookup

Modified:
  stable/9/sys/boot/zfs/zfsimpl.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/boot/   (props changed)

Modified: stable/9/sys/boot/zfs/zfsimpl.c
==============================================================================
--- stable/9/sys/boot/zfs/zfsimpl.c	Sat Oct  6 18:59:23 2012	(r241273)
+++ stable/9/sys/boot/zfs/zfsimpl.c	Sat Oct  6 19:01:20 2012	(r241274)
@@ -1289,6 +1289,8 @@ fzap_lookup(const spa_t *spa, const dnod
 		zc = &ZAP_LEAF_CHUNK(&zl, zc->l_entry.le_next);
 	}
 	if (fzap_name_equal(&zl, zc, name)) {
+		if (zc->l_entry.le_value_intlen * zc->l_entry.le_value_numints > 8)
+			return (E2BIG);
 		*value = fzap_leaf_value(&zl, zc);
 		return (0);
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210061901.q96J1KhK021119>