kobject: Replace strlcpy with strscpy

[sfrench/cifs-2.6.git] / lib / kobject_uevent.c

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 7c44b7ae4c5c34bb586a9c362ed9b06913b54bb1..fb9a2f06dd1e79db0e5db17362c88152790e2b36 100644 (file)
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -254,10 +254,10 @@ static int init_uevent_argv(struct kobj_uevent_env *env, const char *subsystem)
        int buffer_size = sizeof(env->buf) - env->buflen;
        int len;
 
-       len = strlcpy(&env->buf[env->buflen], subsystem, buffer_size);
-       if (len >= buffer_size) {
-               pr_warn("init_uevent_argv: buffer size of %d too small, needed %d\n",
-                       buffer_size, len);
+       len = strscpy(&env->buf[env->buflen], subsystem, buffer_size);
+       if (len < 0) {
+               pr_warn("%s: insufficient buffer space (%u left) for %s\n",
+                       __func__, buffer_size, subsystem);
                return -ENOMEM;
        }