Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 286b63d0 authored by Roel Kluin's avatar Roel Kluin Committed by Roland Dreier
Browse files

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: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent e07cccf4

drivers/infiniband/hw/ipath/ipath_file_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/infiniband/hw/ipath/ipath_mad.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}