android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20210406034434.442251-1-yangyingliang@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Yang Yingliang 2021-04-06 11:44:34 +08:00 committed by Greg Kroah-Hartman
parent 6c00365d53
commit 0d5cf95465
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/accessibility/speakup/i18n.c
View File

@ -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)) if ((index < MSG_FIRST_INDEX) || (index >= MSG_LAST_INDEX))
return -EINVAL; return -EINVAL;
newstr = kmalloc(length + 1, GFP_KERNEL); newstr = kmemdup_nul(text, length, GFP_KERNEL);
if (!newstr) if (!newstr)
return -ENOMEM; return -ENOMEM;
memcpy(newstr, text, length);
newstr[length] = '\0';
if (index >= MSG_FORMATTED_START && if (index >= MSG_FORMATTED_START &&
index <= MSG_FORMATTED_END && index <= MSG_FORMATTED_END &&
!fmt_validate(speakup_default_msgs[index], newstr)) { !fmt_validate(speakup_default_msgs[index], newstr)) {