Commit 0d5cf954 authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

speakup: i18n: Switch to kmemdup_nul() in spk_msg_set() 



Use kmemdup_nul() helper instead of open-coding to
simplify the code in spk_msg_set().

Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20210406034434.442251-1-yangyingliang@huawei.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6c00365d

drivers/accessibility/speakup/i18n.c

+1 −3
Original line number Diff line number Diff line
@@ -548,12 +548,10 @@ ssize_t spk_msg_set(enum msg_index_t index, char *text, size_t length) 
	if ((index < MSG_FIRST_INDEX) || (index >= MSG_LAST_INDEX))

		return -EINVAL;



	newstr = kmalloc(length + 1, GFP_KERNEL);

	newstr = kmemdup_nul(text, length, GFP_KERNEL);

	if (!newstr)

		return -ENOMEM;



	memcpy(newstr, text, length);

	newstr[length] = '\0';

	if (index >= MSG_FORMATTED_START &&

	    index <= MSG_FORMATTED_END &&

	    !fmt_validate(speakup_default_msgs[index], newstr)) {