lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 12 Oct 2014 12:49:31 +0200 From: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se> To: Matt Mackall <mpm@...enic.com>, Herbert Xu <herbert@...dor.apana.org.au> Cc: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se>, Torsten Duwe <duwe@....de>, "Theodore Ts'o" <tytso@....edu>, Jason Cooper <jason@...edaemon.net>, Amit Shah <amit.shah@...hat.com>, Stephen Boyd <sboyd@...eaurora.org>, Paul Gortmaker <paul.gortmaker@...driver.com>, Kees Cook <keescook@...omium.org>, Dan Carpenter <dan.carpenter@...cle.com>, linux-kernel@...r.kernel.org Subject: [PATCH v2] char: hw_random: core.c: Changed from using strncat to strlcat Changed from using strncat to strlcat to simplify the code Signed-off-by: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se> --- drivers/char/hw_random/core.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c index aa30a25..1500cfd 100644 --- a/drivers/char/hw_random/core.c +++ b/drivers/char/hw_random/core.c @@ -281,7 +281,6 @@ static ssize_t hwrng_attr_available_show(struct device *dev, char *buf) { int err; - ssize_t ret = 0; struct hwrng *rng; err = mutex_lock_interruptible(&rng_mutex); @@ -289,16 +288,13 @@ static ssize_t hwrng_attr_available_show(struct device *dev, return -ERESTARTSYS; buf[0] = '\0'; list_for_each_entry(rng, &rng_list, list) { - strncat(buf, rng->name, PAGE_SIZE - ret - 1); - ret += strlen(rng->name); - strncat(buf, " ", PAGE_SIZE - ret - 1); - ret++; + strlcat(buf, rng->name, PAGE_SIZE); + strlcat(buf, " ", PAGE_SIZE); } - strncat(buf, "\n", PAGE_SIZE - ret - 1); - ret++; + strlcat(buf, "\n", PAGE_SIZE); mutex_unlock(&rng_mutex); - return ret; + return strlen(buf); } static DEVICE_ATTR(rng_current, S_IRUGO | S_IWUSR, -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists