Re: [PATCH 02/20] crypto: Manual replacement of the deprecated strlcpy() with return values
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: 2021-03-04 04:39:04
Also in:
lkml
On Mon, Feb 22, 2021 at 04:12:13PM +0100, Romain Perier wrote:
quoted hunk ↗ jump to hunk
diff --git a/crypto/lrw.c b/crypto/lrw.c index bcf09fbc750a..4d35f4439012 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c@@ -357,10 +357,10 @@ static int lrw_create(struct crypto_template *tmpl, struct rtattr **tb) * cipher name. */ if (!strncmp(cipher_name, "ecb(", 4)) { - unsigned len; + ssize_t len; - len = strlcpy(ecb_name, cipher_name + 4, sizeof(ecb_name)); - if (len < 2 || len >= sizeof(ecb_name)) + len = strscpy(ecb_name, cipher_name + 4, sizeof(ecb_name)); + if (len == -E2BIG || len < 2)
len == -E2BIG is superfluous as len < 2 will catch it anyway. Thanks, -- Email: Herbert Xu [off-list ref] Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt