summaryrefslogtreecommitdiffstats
path: root/libfdisk/src/fdiskP.h
diff options
context:
space:
mode:
authorKarel Zak2014-07-14 14:53:41 +0200
committerKarel Zak2014-07-14 15:05:22 +0200
commit7c2cfb18964b00881e65c461742af9038bd5b287 (patch)
tree03881cd0a38bab944fd9d84df86ce62f90dc1162 /libfdisk/src/fdiskP.h
parentbuild-sys: release++ (v2.25-rc2) (diff)
downloadkernel-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/fdiskP.h')
-rw-r--r--libfdisk/src/fdiskP.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h
index f5b4bb8ed..ea6e291b1 100644
--- a/libfdisk/src/fdiskP.h
+++ b/libfdisk/src/fdiskP.h
@@ -338,7 +338,9 @@ struct fdisk_ask {
struct fdisk_context {
int dev_fd; /* device descriptor */
char *dev_path; /* device path */
+
unsigned char *firstsector; /* buffer with master boot record */
+ unsigned long firstsector_bufsz;
/* topology */
unsigned long io_size; /* I/O size used by fdisk */
@@ -418,7 +420,7 @@ extern int fdisk_apply_user_device_properties(struct fdisk_context *cxt);
extern void fdisk_zeroize_device_properties(struct fdisk_context *cxt);
/* utils.c */
-extern void fdisk_zeroize_firstsector(struct fdisk_context *cxt);
+extern int fdisk_init_firstsector_buffer(struct fdisk_context *cxt);
extern int fdisk_read_firstsector(struct fdisk_context *cxt);
extern char *fdisk_partname(const char *dev, size_t partno);