Date: Mon, 15 Dec 2014 11:57:40 +0000 (UTC) From: Ruslan Bukin <br@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r275799 - head/sys/arm/mv Message-ID: <201412151157.sBFBvejt035212@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: br Date: Mon Dec 15 11:57:39 2014 New Revision: 275799 URL: https://svnweb.freebsd.org/changeset/base/275799 Log: Follow r275792 eliminating fdt_data_verify(). Modified: head/sys/arm/mv/mv_common.c head/sys/arm/mv/mv_pci.c Modified: head/sys/arm/mv/mv_common.c ============================================================================== --- head/sys/arm/mv/mv_common.c Mon Dec 15 11:05:53 2014 (r275798) +++ head/sys/arm/mv/mv_common.c Mon Dec 15 11:57:39 2014 (r275799) @@ -1939,8 +1939,7 @@ fdt_get_ranges(const char *nodename, voi if (tuples_count <= 0) return (ERANGE); - if (fdt_ranges_verify(buf, tuples_count, par_addr_cells, - addr_cells, size_cells) != 0) + if (par_addr_cells > 2 || addr_cells > 2 || size_cells > 2) return (ERANGE); *tuples = tuples_count; Modified: head/sys/arm/mv/mv_pci.c ============================================================================== --- head/sys/arm/mv/mv_pci.c Mon Dec 15 11:05:53 2014 (r275798) +++ head/sys/arm/mv/mv_pci.c Mon Dec 15 11:57:39 2014 (r275799) @@ -180,8 +180,7 @@ mv_pci_ranges_decode(phandle_t node, str rangesptr += offset_cells; } - if (fdt_data_verify((void *)rangesptr, par_addr_cells - - offset_cells)) { + if ((par_addr_cells - offset_cells) > 2) { rv = ERANGE; goto out; } @@ -189,7 +188,7 @@ mv_pci_ranges_decode(phandle_t node, str par_addr_cells - offset_cells); rangesptr += par_addr_cells - offset_cells; - if (fdt_data_verify((void *)rangesptr, size_cells)) { + if (size_cells > 2) rv = ERANGE; goto out; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412151157.sBFBvejt035212>