static int
sfdisk (const char *device, int n, int cyls, int heads, int sectors,
const char *extra_flag,
- char * const* const lines)
+ char *const *lines)
{
FILE *fp;
char buf[256];
int i;
- strcpy (buf, "/sbin/sfdisk");
+ strcpy (buf, "sfdisk");
if (n > 0)
sprintf (buf + strlen (buf), " -N %d", n);
sprintf (buf + strlen (buf), " -H %d", heads);
if (sectors)
sprintf (buf + strlen (buf), " -S %d", sectors);
- if (extra_flag)
+
+ /* The above are all guaranteed to fit in the fixed-size buffer.
+ However, extra_flag and device have no restrictions,
+ so we must check. */
+
+ if (extra_flag) {
+ if (strlen (buf) + 1 + strlen (extra_flag) >= sizeof buf) {
+ reply_with_error ("internal buffer overflow: sfdisk extra_flag too long");
+ return -1;
+ }
sprintf (buf + strlen (buf), " %s", extra_flag);
+ }
- /* Safe because of RESOLVE_DEVICE above: */
+ if (strlen (buf) + 1 + strlen (device) >= sizeof buf) {
+ reply_with_error ("internal buffer overflow: sfdisk device name too long");
+ return -1;
+ }
sprintf (buf + strlen (buf), " %s", device);
if (verbose)
fp = popen (buf, "w");
if (fp == NULL) {
- reply_with_perror (buf);
+ reply_with_perror ("failed to open pipe: %s", buf);
return -1;
}
for (i = 0; lines[i] != NULL; ++i) {
if (fprintf (fp, "%s\n", lines[i]) < 0) {
- reply_with_perror (buf);
+ reply_with_perror ("failed to write to pipe: %s", buf);
pclose (fp);
return -1;
}
return -1;
}
+ /* sfdisk sometimes fails on fast machines with:
+ *
+ * Re-reading the partition table ...
+ * BLKRRPART: Device or resource busy
+ * The command to re-read the partition table failed.
+ * Run partprobe(8), kpartx(8) or reboot your system now,
+ * before using mkfs
+ *
+ * Unclear if this is a bug in sfdisk or the kernel or some
+ * other component. In any case, reread the partition table
+ * unconditionally here.
+ */
+ (void) command (NULL, NULL, "blockdev", "--rereadpt", device, NULL);
+
udev_settle ();
return 0;
int
do_sfdisk (const char *device, int cyls, int heads, int sectors,
- char **lines)
+ char *const *lines)
{
return sfdisk (device, 0, cyls, heads, sectors, NULL, lines);
}
do_sfdisk_N (const char *device, int n, int cyls, int heads, int sectors,
const char *line)
{
- const char *lines[2] = { line, NULL };
+ char const *const lines[2] = { line, NULL };
- return sfdisk (device, n, cyls, heads, sectors, NULL, lines);
+ return sfdisk (device, n, cyls, heads, sectors, NULL, (void *) lines);
}
int
-do_sfdiskM (const char *device, char **lines)
+do_sfdiskM (const char *device, char *const *lines)
{
return sfdisk (device, 0, 0, 0, 0, "-uM", lines);
}
char *out, *err;
int r;
- r = command (&out, &err, "/sbin/sfdisk", flag, device, NULL);
+ r = command (&out, &err, "sfdisk", flag, device, NULL);
if (r == -1) {
- reply_with_error ("sfdisk: %s: %s", device, err);
+ reply_with_error ("%s: %s", device, err);
free (out);
free (err);
return NULL;