LU-17592 build: kernel 6.8 removed strlcpy()

[fs/lustre-release.git] / lnet / selftest / framework.c

diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c
index 6afad0d..aa45e47 100644 (file)
--- a/lnet/selftest/framework.c
+++ b/lnet/selftest/framework.c
@@ -265,7 +265,7 @@ sfw_init_session(struct sfw_session *sn, struct lst_sid sid,
        refcount_set(&sn->sn_refcount, 1); /* +1 for caller */
        atomic_set(&sn->sn_brw_errors, 0);
        atomic_set(&sn->sn_ping_errors, 0);
-       strlcpy(&sn->sn_name[0], name, sizeof(sn->sn_name));
+       strscpy(&sn->sn_name[0], name, sizeof(sn->sn_name));
 
        sn->sn_timer_active = 0;
        sn->sn_id.ses_stamp = sid.ses_stamp;
@@ -438,10 +438,10 @@ sfw_make_session(struct srpc_mksn_reqst *request, struct srpc_mksn_reply *reply)
 
                if (!request->mksn_force) {
                        reply->mksn_status = EBUSY;
-                       cplen = strlcpy(&reply->mksn_name[0], &sn->sn_name[0],
+                       cplen = strscpy(&reply->mksn_name[0], &sn->sn_name[0],
                                        sizeof(reply->mksn_name));
-                       if (cplen >= sizeof(reply->mksn_name))
-                               return -E2BIG;
+                       if (cplen < 0)
+                               return cplen;
                        return 0;
                }
        }
@@ -520,6 +520,7 @@ sfw_debug_session(struct srpc_debug_reqst *request,
                  struct srpc_debug_reply *reply)
 {
        struct sfw_session *sn = sfw_data.fw_session;
+       int cplen;
 
        if (sn == NULL) {
                reply->dbg_status = ESRCH;
@@ -530,9 +531,10 @@ sfw_debug_session(struct srpc_debug_reqst *request,
        reply->dbg_status  = 0;
        reply->dbg_sid = get_old_sid(sn);
        reply->dbg_timeout = sn->sn_timeout;
-       if (strlcpy(reply->dbg_name, &sn->sn_name[0],
-                   sizeof(reply->dbg_name)) >= sizeof(reply->dbg_name))
-               return -E2BIG;
+       cplen = strscpy(reply->dbg_name, &sn->sn_name[0],
+                   sizeof(reply->dbg_name));
+       if (cplen < 0)
+               return cplen;
 
        return 0;
 }