Merge branch 'upstream' into tizen

[platform/upstream/cryptsetup.git] / lib / utils_devpath.c

diff --git a/lib/utils_devpath.c b/lib/utils_devpath.c
index 44d7028..dc5a5bb 100644 (file)
--- a/lib/utils_devpath.c
+++ b/lib/utils_devpath.c
@@ -3,8 +3,8 @@
  *
  * Copyright (C) 2004 Jana Saout <jana@saout.de>
  * Copyright (C) 2004-2007 Clemens Fruhwirth <clemens@endorphin.org>
- * Copyright (C) 2009-2021 Red Hat, Inc. All rights reserved.
- * Copyright (C) 2009-2021 Milan Broz
+ * Copyright (C) 2009-2023 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2009-2023 Milan Broz
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -408,10 +408,10 @@ int lookup_by_disk_id(const char *dm_uuid)
        return r;
 }
 
-int lookup_by_sysfs_uuid_field(const char *dm_uuid, size_t max_len)
+int lookup_by_sysfs_uuid_field(const char *dm_uuid)
 {
        struct dirent *entry;
-       char subpath[PATH_MAX], uuid[max_len];
+       char subpath[PATH_MAX], uuid[DM_UUID_LEN];
        ssize_t s;
        struct stat st;
        int fd, len, r = 0; /* not found */
@@ -443,7 +443,7 @@ int lookup_by_sysfs_uuid_field(const char *dm_uuid, size_t max_len)
                }
 
                /* reads binary data */
-               s = read_buffer(fd, uuid, max_len - 1);
+               s = read_buffer(fd, uuid, sizeof(uuid) - 1);
                if (s > 0) {
                        uuid[s] = '\0';
                        if (!strncmp(uuid, dm_uuid, strlen(dm_uuid)))