diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2009-09-05 20:23:21 -0700 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2009-09-05 20:23:21 -0700 |
| commit | 286b63d09660de0fbd0d7748984d7ae491c7fdb6 (patch) | |
| tree | 8e7675a83dd395ec0bf4c9e403a75e8c90364607 /drivers/infiniband | |
| parent | e07cccf4046978df10f2e13fe2b99b2f9b3a65db (diff) | |
| download | op-kernel-dev-286b63d09660de0fbd0d7748984d7ae491c7fdb6.zip op-kernel-dev-286b63d09660de0fbd0d7748984d7ae491c7fdb6.tar.gz | |
IB/ipath: strncpy() doesn't always NUL-terminate
strlcpy() will always null terminate the string. node_desc is not
guaranteed to be NUL-terminated so just use memcpy().
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 | ||||
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_mad.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c index 2317398..38a2870 100644 --- a/drivers/infiniband/hw/ipath/ipath_file_ops.c +++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c @@ -1616,7 +1616,7 @@ static int try_alloc_port(struct ipath_devdata *dd, int port, pd->port_cnt = 1; port_fp(fp) = pd; pd->port_pid = get_pid(task_pid(current)); - strncpy(pd->port_comm, current->comm, sizeof(pd->port_comm)); + strlcpy(pd->port_comm, current->comm, sizeof(pd->port_comm)); ipath_stats.sps_ports++; ret = 0; } else diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c index 16a702d..ceb98ee 100644 --- a/drivers/infiniband/hw/ipath/ipath_mad.c +++ b/drivers/infiniband/hw/ipath/ipath_mad.c @@ -60,7 +60,7 @@ static int recv_subn_get_nodedescription(struct ib_smp *smp, if (smp->attr_mod) smp->status |= IB_SMP_INVALID_FIELD; - strncpy(smp->data, ibdev->node_desc, sizeof(smp->data)); + memcpy(smp->data, ibdev->node_desc, sizeof(smp->data)); return reply(smp); } |
