cmd: gpt: Fix off by 1 errors

The buffer for a name to be copied into must also contain the
terminating 0 byte but strlen returns the length of the string without
counting that 0 byte. Adjust the length checks to take this into
account.

This issue found by Smatch.

Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org>

diff --git a/cmd/gpt.c b/cmd/gpt.c
index 27aea2df197c5a76b37f5bf16e68809f5af61a02..e18e5036a06a005fa8a3913dcae9d5003f6be6ee 100644 (file)
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -911,8 +911,9 @@ static int do_rename_gpt_parts(struct blk_desc *dev_desc, char *subcomm,
                goto out;
 
        if (!strcmp(subcomm, "swap")) {
-               if ((strlen(name1) > PART_NAME_LEN) || (strlen(name2) > PART_NAME_LEN)) {
-                       printf("Names longer than %d characters are truncated.\n", PART_NAME_LEN);
+               if ((strlen(name1) >= PART_NAME_LEN) || (strlen(name2) >= PART_NAME_LEN)) {
+                       printf("Names longer than %d characters are truncated.\n",
+                              PART_NAME_LEN - 1);
                        ret = -EINVAL;
                        goto out;
                }
@@ -967,8 +968,9 @@ static int do_rename_gpt_parts(struct blk_desc *dev_desc, char *subcomm,
                *first = *second;
                *second = tmp_part;
        } else { /* rename */
-               if (strlen(name2) > PART_NAME_LEN) {
-                       printf("Names longer than %d characters are truncated.\n", PART_NAME_LEN);
+               if (strlen(name2) >= PART_NAME_LEN) {
+                       printf("Names longer than %d characters are truncated.\n",
+                              PART_NAME_LEN - 1);
                        ret = -EINVAL;
                        goto out;
                }