ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libblkid: (zfs) keep bufferes read-only 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2015-09-22 15:27:39 +02:00
parent 6b86ef4a6a
commit 9325a8be9e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libblkid/src/superblocks/zfs.c
View File

@ -70,9 +70,10 @@ struct nvlist {
static void zfs_extract_guid_name(blkid_probe pr, loff_t offset)
{
unsigned char *p, buff[4096];
struct nvlist *nvl;
struct nvpair *nvp;
size_t left = 4096;
size_t left = sizeof(buff);
int found = 0;
offset = (offset & ~(VDEV_LABEL_SIZE - 1)) + VDEV_LABEL_NVPAIR;
@ -81,10 +82,14 @@ static void zfs_extract_guid_name(blkid_probe pr, loff_t offset)
* the first 4k (left) of the nvlist. This is true for all pools
* I've seen, and simplifies this code somewhat, because we don't
* have to handle an nvpair crossing a buffer boundary. */
nvl = (struct nvlist *)blkid_probe_get_buffer(pr, offset, left);
if (nvl == NULL)
p = blkid_probe_get_buffer(pr, offset, left);
if (!p)
return;
/* libblkid buffers are strictly readonly, but the code below modifies nvpair etc. */
memcpy(buff, p, sizeof(buff));
nvl = (struct nvlist *) buff;
nvdebug("zfs_extract: nvlist offset %llu\n", offset);
nvp = &nvl->nvl_nvpair;