UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: irda: using kzalloc() instead of kmalloc() to avoid strncpy() issue. 

'discovery->data.info' length is 22, NICKNAME_MAX_LEN is 21, so the
strncpy() will always left the last byte of 'discovery->data.info'
uninitialized.

When 'text' length is longer than 21 (NICKNAME_MAX_LEN), if still left
the last byte of 'discovery->data.info' uninitialized, the next
strlen() will cause issue.

Also 'discovery->data' is 'struct irda_device_info' which defined in
"include/uapi/...", it may copy to user mode, so need whole initialized.

All together, need use kzalloc() instead of kmalloc() to initialize all
members firstly.

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Chen Gang 2013-05-16 23:13:04 +00:00 committed by David S. Miller
parent 6b21e1b77d
commit ff0102ee10
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/irda/irlap_frame.c
View File

@ -544,7 +544,7 @@ static void irlap_recv_discovery_xid_cmd(struct irlap_cb *self,
/* /*
* We now have some discovery info to deliver! * We now have some discovery info to deliver!
*/ */
discovery = kmalloc(sizeof(discovery_t), GFP_ATOMIC); discovery = kzalloc(sizeof(discovery_t), GFP_ATOMIC);
if (!discovery) { if (!discovery) {
IRDA_WARNING("%s: unable to malloc!\n", __func__); IRDA_WARNING("%s: unable to malloc!\n", __func__);
return; return;