X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fswap.c;h=5de6ba61c718927779c0a8f769d53191b58d5c95;hp=f22f2dec16729d441d1ffe12b63e5de41dabf331;hb=9733d4746988b3a072d8bb1daac4b9795b8f4134;hpb=9d158c3ab132df21d58890f18224cd2fe020de67 diff --git a/daemon/swap.c b/daemon/swap.c index f22f2de..5de6ba6 100644 --- a/daemon/swap.c +++ b/daemon/swap.c @@ -28,6 +28,9 @@ #include "actions.h" #include "optgroups.h" +/* Confirmed this is true for Linux swap partitions from the Linux sources. */ +#define SWAP_LABEL_MAX 16 + /* Convenient place to test for the later version of e2fsprogs * and util-linux which supports -U parameters to specify UUIDs. * (Not supported in RHEL 5). @@ -77,6 +80,12 @@ do_mkswap (const char *device) int do_mkswap_L (const char *label, const char *device) { + if (strlen (label) > SWAP_LABEL_MAX) { + reply_with_error ("%s: Linux swap labels are limited to %d bytes", + label, SWAP_LABEL_MAX); + return -1; + } + return mkswap (device, "-L", label); } @@ -179,12 +188,24 @@ do_swapoff_file (const char *path) int do_swapon_label (const char *label) { + if (strlen (label) > SWAP_LABEL_MAX) { + reply_with_error ("%s: Linux swap labels are limited to %d bytes", + label, SWAP_LABEL_MAX); + return -1; + } + return swaponoff ("swapon", "-L", label); } int do_swapoff_label (const char *label) { + if (strlen (label) > SWAP_LABEL_MAX) { + reply_with_error ("%s: Linux swap labels are limited to %d bytes", + label, SWAP_LABEL_MAX); + return -1; + } + return swaponoff ("swapoff", "-L", label); }