// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
 /*
- * Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All rights reserved.
+ * Copyright 2018-2021 Amazon.com, Inc. or its affiliates. All rights reserved.
  */
 
 #include <linux/module.h>
        if (!hinf)
                return;
 
-       strlcpy(hinf->os_dist_str, utsname()->release,
-               min(sizeof(hinf->os_dist_str), sizeof(utsname()->release)));
+       strscpy(hinf->os_dist_str, utsname()->release,
+               sizeof(hinf->os_dist_str));
        hinf->os_type = EFA_ADMIN_OS_LINUX;
-       strlcpy(hinf->kernel_ver_str, utsname()->version,
-               min(sizeof(hinf->kernel_ver_str), sizeof(utsname()->version)));
+       strscpy(hinf->kernel_ver_str, utsname()->version,
+               sizeof(hinf->kernel_ver_str));
        hinf->kernel_ver = LINUX_VERSION_CODE;
        EFA_SET(&hinf->driver_ver, EFA_ADMIN_HOST_INFO_DRIVER_MAJOR, 0);
        EFA_SET(&hinf->driver_ver, EFA_ADMIN_HOST_INFO_DRIVER_MINOR, 0);