redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

gpu: drm: drm_dp_mst_topology.c: Fix improper use of strncat

Browse source 
Fixed wrong usage of strncat, switched to strlcpy.
While sending the string size to function to reduce
the potential for misuse in future.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Rickard Strandqvist 2014-10-12 00:02:32 +02:00 committed by Daniel Vetter
parent a1f1a79c51
commit d87af4d105
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/gpu/drm/drm_dp_mst_topology.c
View file

@ -995,19 +995,20 @@ static void drm_dp_check_port_guid(struct drm_dp_mst_branch *mstb,
static void build_mst_prop_path(struct drm_dp_mst_port *port, static void build_mst_prop_path(struct drm_dp_mst_port *port,
struct drm_dp_mst_branch *mstb, struct drm_dp_mst_branch *mstb,
char *proppath) char *proppath,
size_t proppath_size)
{ {
int i; int i;
char temp[8]; char temp[8];
snprintf(proppath, 255, "mst:%d", mstb->mgr->conn_base_id); snprintf(proppath, proppath_size, "mst:%d", mstb->mgr->conn_base_id);
for (i = 0; i < (mstb->lct - 1); i++) { for (i = 0; i < (mstb->lct - 1); i++) {
int shift = (i % 2) ? 0 : 4; int shift = (i % 2) ? 0 : 4;
int port_num = mstb->rad[i / 2] >> shift; int port_num = mstb->rad[i / 2] >> shift;
snprintf(temp, 8, "-%d", port_num); snprintf(temp, sizeof(temp), "-%d", port_num);
strncat(proppath, temp, 255); strlcat(proppath, temp, proppath_size);
} }
snprintf(temp, 8, "-%d", port->port_num); snprintf(temp, sizeof(temp), "-%d", port->port_num);
strncat(proppath, temp, 255); strlcat(proppath, temp, proppath_size);
} }
static void drm_dp_add_port(struct drm_dp_mst_branch *mstb, static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
@ -1078,7 +1079,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
if (created && !port->input) { if (created && !port->input) {
char proppath[255]; char proppath[255];
build_mst_prop_path(port, mstb, proppath); build_mst_prop_path(port, mstb, proppath, sizeof(proppath));
port->connector = (*mstb->mgr->cbs->add_connector)(mstb->mgr, port, proppath); port->connector = (*mstb->mgr->cbs->add_connector)(mstb->mgr, port, proppath);
} }