X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgc%2Fmgc_request_server.c;h=15e2bf500b4c9bb3c6468d57dd50d3d776f60aae;hb=7a0517fa25162a6af2e10827851d7d8c7a4ed1ac;hp=6eadd9d7e1c00978bd19e9a529d09d4e402a65d4;hpb=b09f56c208c6c34375d098f66075688f329b7c76;p=fs%2Flustre-release.git diff --git a/lustre/mgc/mgc_request_server.c b/lustre/mgc/mgc_request_server.c index 6eadd9d..15e2bf5 100644 --- a/lustre/mgc/mgc_request_server.c +++ b/lustre/mgc/mgc_request_server.c @@ -361,9 +361,9 @@ again: body = req_capsule_client_get(&req->rq_pill, &RMF_MGS_CONFIG_BODY); LASSERT(body); LASSERT(sizeof(body->mcb_name) > strlen(cld->cld_logname)); - if (strlcpy(body->mcb_name, cld->cld_logname, sizeof(body->mcb_name)) - >= sizeof(body->mcb_name)) - GOTO(out, rc = -E2BIG); + rc = strscpy(body->mcb_name, cld->cld_logname, sizeof(body->mcb_name)); + if (rc < 0) + GOTO(out, rc); body->mcb_offset = config_read_offset; body->mcb_type = cld->cld_type; body->mcb_bits = PAGE_SHIFT;