From: Yury Norov Date: Tue, 14 May 2019 22:44:46 +0000 (-0700) Subject: include/linux/cpumask.h: fix double string traverse in cpumask_parse X-Git-Tag: v5.4-rc1~985^2~49 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3713a4e1fdb8da86f96a3e770b08e278d97529b4;p=platform%2Fkernel%2Flinux-rpi.git include/linux/cpumask.h: fix double string traverse in cpumask_parse cpumask_parse() finds first occurrence of either or strchr() and strlen(). We can do it better with a single call of strchrnul(). [akpm@linux-foundation.org: remove unneeded cast] Link: http://lkml.kernel.org/r/20190409204208.12190-1-ynorov@marvell.com Signed-off-by: Yury Norov Acked-by: Rasmus Villemoes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index 147bdec..2175547 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h @@ -633,8 +633,7 @@ static inline int cpumask_parselist_user(const char __user *buf, int len, */ static inline int cpumask_parse(const char *buf, struct cpumask *dstp) { - char *nl = strchr(buf, '\n'); - unsigned int len = nl ? (unsigned int)(nl - buf) : strlen(buf); + unsigned int len = strchrnul(buf, '\n') - buf; return bitmap_parse(buf, len, cpumask_bits(dstp), nr_cpumask_bits); }