diff options
| author | Karel Zak | 2014-07-14 14:53:41 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-07-14 15:05:22 +0200 |
| commit | 7c2cfb18964b00881e65c461742af9038bd5b287 (patch) | |
| tree | 03881cd0a38bab944fd9d84df86ce62f90dc1162 /libfdisk/src/alignment.c | |
| parent | build-sys: release++ (v2.25-rc2) (diff) | |
| download | kernel-qcow2-util-linux-7c2cfb18964b00881e65c461742af9038bd5b287.tar.gz kernel-qcow2-util-linux-7c2cfb18964b00881e65c461742af9038bd5b287.tar.xz kernel-qcow2-util-linux-7c2cfb18964b00881e65c461742af9038bd5b287.zip | |
libfdisk: make first sector buffer usage more robust
$ ~/util-linux/fdisk -b 4096 xxx
..
Segmentation fault
The buffer has to be reinitialized always when we apply a new
device properties (e.g. sector size).
Reported-by: Bernhard Voelker <mail@bernhard-voelker.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/alignment.c')
| -rw-r--r-- | libfdisk/src/alignment.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libfdisk/src/alignment.c b/libfdisk/src/alignment.c index a456b98b5..65b2c4a23 100644 --- a/libfdisk/src/alignment.c +++ b/libfdisk/src/alignment.c @@ -239,6 +239,8 @@ int fdisk_apply_user_device_properties(struct fdisk_context *cxt) recount_geometry(cxt); fdisk_reset_alignment(cxt); + if (cxt->firstsector_bufsz != cxt->sector_size) + fdisk_read_firstsector(cxt); DBG(CXT, ul_debugobj(cxt, "new C/H/S: %u/%u/%u", (unsigned) cxt->geom.cylinders, @@ -484,9 +486,8 @@ int fdisk_reset_alignment(struct fdisk_context *cxt) if (cxt->label && cxt->label->op->reset_alignment) rc = cxt->label->op->reset_alignment(cxt); - DBG(CXT, ul_debugobj(cxt, "%s alignment reseted to: " + DBG(CXT, ul_debugobj(cxt, "alignment reseted to: " "first LBA=%ju, last LBA=%ju, grain=%lu [rc=%d]", - cxt->label ? cxt->label->name : NULL, (uintmax_t) cxt->first_lba, (uintmax_t) cxt->last_lba, cxt->grain, rc)); return rc; |