git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generator: Remove unnecessary macro redefinitions.
[libguestfs.git]
/
daemon
/
ext2.c
diff --git
a/daemon/ext2.c
b/daemon/ext2.c
index
7f9d2e0
..
725352e
100644
(file)
--- a/
daemon/ext2.c
+++ b/
daemon/ext2.c
@@
-24,11
+24,14
@@
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
-#include "
../src/
guestfs_protocol.h"
+#include "guestfs_protocol.h"
#include "daemon.h"
#include "c-ctype.h"
#include "actions.h"
#include "daemon.h"
#include "c-ctype.h"
#include "actions.h"
+/* Confirmed this is true up to ext4 from the Linux sources. */
+#define EXT2_LABEL_MAX 16
+
/* Choose which tools like mke2fs to use. For RHEL 5 (only) there
* is a special set of tools which support ext2/3/4. eg. On RHEL 5,
* mke2fs only supports ext2/3, but mke4fs supports ext2/3/4.
/* Choose which tools like mke2fs to use. For RHEL 5 (only) there
* is a special set of tools which support ext2/3/4. eg. On RHEL 5,
* mke2fs only supports ext2/3, but mke4fs supports ext2/3/4.
@@
-156,6
+159,12
@@
do_set_e2label (const char *device, const char *label)
if (e2prog (prog) == -1)
return -1;
if (e2prog (prog) == -1)
return -1;
+ if (strlen (label) > EXT2_LABEL_MAX) {
+ reply_with_error ("%s: ext2 labels are limited to %d bytes",
+ label, EXT2_LABEL_MAX);
+ return -1;
+ }
+
r = command (NULL, &err, prog, device, label, NULL);
if (r == -1) {
reply_with_error ("%s", err);
r = command (NULL, &err, prog, device, label, NULL);
if (r == -1) {
reply_with_error ("%s", err);
@@
-320,6
+329,12
@@
do_mke2journal_L (int blocksize, const char *label, const char *device)
if (e2prog (prog) == -1)
return -1;
if (e2prog (prog) == -1)
return -1;
+ if (strlen (label) > EXT2_LABEL_MAX) {
+ reply_with_error ("%s: ext2 labels are limited to %d bytes",
+ label, EXT2_LABEL_MAX);
+ return -1;
+ }
+
char blocksize_s[32];
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
char blocksize_s[32];
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
@@
-406,6
+421,12
@@
do_mke2fs_JL (const char *fstype, int blocksize, const char *device,
if (e2prog (prog) == -1)
return -1;
if (e2prog (prog) == -1)
return -1;
+ if (strlen (label) > EXT2_LABEL_MAX) {
+ reply_with_error ("%s: ext2 labels are limited to %d bytes",
+ label, EXT2_LABEL_MAX);
+ return -1;
+ }
+
char blocksize_s[32];
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
char blocksize_s[32];
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);