Attachment 156873 Details for Bug 199476 – Proposed patch

[patch] Proposed patch

uncompress.diff (text/plain), 2.83 KB, created by Andrey V. Elsukov on 2015-05-18 13:15:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey V. Elsukov

Created: 2015-05-18 13:15:12 UTC

Size: 2.83 KB

patch

obsolete

>Index: head/sys/geom/uncompress/g_uncompress.c
>===================================================================
>--- head/sys/geom/uncompress/g_uncompress.c	(revision 283051)
>+++ head/sys/geom/uncompress/g_uncompress.c	(working copy)
>@@ -464,7 +464,8 @@ g_uncompress_taste(struct g_class *mp, struct g_pr
> 	struct g_provider *pp2;
> 	struct g_consumer *cp;
> 	struct g_geom *gp;
>-	uint32_t i, total_offsets, type;
>+	uint64_t *offsets;
>+	uint32_t i, r, total, type;
> 	uint8_t *buf;
> 	int error;
> 
>@@ -499,8 +500,8 @@ g_uncompress_taste(struct g_class *mp, struct g_pr
> 	 */
> 	DPRINTF(("%s: media sectorsize %u, mediasize %jd\n",
> 	    gp->name, pp->sectorsize, (intmax_t)pp->mediasize));
>-	i = roundup(sizeof(struct cloop_header), pp->sectorsize);
>-	buf = g_read_data(cp, 0, i, NULL);
>+	total = roundup(sizeof(struct cloop_header), pp->sectorsize);
>+	buf = g_read_data(cp, 0, total, NULL);
> 	if (buf == NULL)
> 		goto err;
> 	header = (struct cloop_header *) buf;
>@@ -550,27 +551,35 @@ g_uncompress_taste(struct g_class *mp, struct g_pr
> 		printf("%s: block size (%u) should not be larger than %d.\n",
> 		    gp->name, sc->blksz, MAX_BLKSZ);
> 	}
>-	total_offsets = sc->nblocks + 1;
> 	if (sizeof(struct cloop_header) +
>-	    total_offsets * sizeof(uint64_t) > pp->mediasize) {
>+	    sc->nblocks * sizeof(uint64_t) >= pp->mediasize) {
> 		printf("%s: media too small for %u blocks\n",
> 		    gp->name, sc->nblocks);
> 		goto err;
> 	}
>-	free(buf, M_GEOM);
>+	g_free(buf);
> 
>-	i = roundup((sizeof(struct cloop_header) +
>-	    total_offsets * sizeof(uint64_t)), pp->sectorsize);
>-	buf = g_read_data(cp, 0, i, NULL);
>-	if (buf == NULL)
>-		goto err;
>-	sc->offsets = malloc(total_offsets * sizeof(uint64_t),
>+	sc->offsets = malloc(sc->nblocks * sizeof(uint64_t),
> 	    M_GEOM_UNCOMPRESS, M_WAITOK);
>-	for (i = 0; i <= total_offsets; i++) {
>-		sc->offsets[i] = be64toh(((uint64_t *)
>-		    (buf+sizeof(struct cloop_header)))[i]);
>+	total = roundup((sizeof(struct cloop_header) +
>+	    sc->nblocks * sizeof(uint64_t)), pp->sectorsize);
>+#define	RSZ	(total - r > MAXPHYS ? MAXPHYS: total - r)
>+	for (r = 0, i = 0; r < total; r += MAXPHYS) {
>+		buf = g_read_data(cp, r, RSZ, &error);
>+		if (buf == NULL) {
>+			free(sc->offsets, M_GEOM_UNCOMPRESS);
>+			goto err;
>+		}
>+		offsets = (uint64_t *)buf;
>+		if (r == 0)
>+			offsets +=
>+			    sizeof(struct cloop_header) / sizeof(uint64_t);
>+		for (; i < sc->nblocks && offsets < (uint64_t *)(buf + RSZ);
>+		    i++, offsets++)
>+			sc->offsets[i] = be64toh(*offsets);
>+		g_free(buf);
> 	}
>-	free(buf, M_GEOM);
>+#undef RSZ
> 	buf = NULL;
> 	DPRINTF(("%s: done reading offsets\n", gp->name));
> 	mtx_init(&sc->last_mtx, "geom_uncompress cache", NULL, MTX_DEF);
>@@ -619,7 +628,7 @@ err:
> 	g_topology_lock();
> 	g_access(cp, -1, 0, 0);
> 	if (buf != NULL)
>-		free(buf, M_GEOM);
>+		g_free(buf);
> 	if (gp->softc != NULL) {
> 		g_uncompress_softc_free(gp->softc, NULL);
> 		gp->softc = NULL;

Actions: View | Diff

Attachments on bug 199476: 155638 | 156873 | 156876