diff options
| author | Chen Gang <gang.chen@asianux.com> | 2013-05-17 01:13:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-20 00:10:47 +0200 |
| commit | ff0102ee104847023c36357e2b9f133f3f40d211 (patch) | |
| tree | 02e2f942ee44e5a49efdfff22d41fb1fee382e45 /net/irda/irlap_frame.c | |
| parent | netlabel: improve domain mapping validation (diff) | |
| download | linux-ff0102ee104847023c36357e2b9f133f3f40d211.tar.xz linux-ff0102ee104847023c36357e2b9f133f3f40d211.zip | |
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>
Diffstat (limited to 'net/irda/irlap_frame.c')
| -rw-r--r-- | net/irda/irlap_frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c index 8c004161a843..9ea0c933b9ff 100644 --- a/net/irda/irlap_frame.c +++ b/net/irda/irlap_frame.c @@ -544,7 +544,7 @@ static void irlap_recv_discovery_xid_cmd(struct irlap_cb *self, /* * We now have some discovery info to deliver! */ - discovery = kmalloc(sizeof(discovery_t), GFP_ATOMIC); + discovery = kzalloc(sizeof(discovery_t), GFP_ATOMIC); if (!discovery) { IRDA_WARNING("%s: unable to malloc!\n", __func__); return; |