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

Commit 88b58409 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Greg Kroah-Hartman
Browse files

tipc: use destination length for copy string 



commit 29e270fc32192e7729057963ae7120663856c93e upstream.

Got below warning with gcc 8.2 compiler.

net/tipc/topsrv.c: In function ‘tipc_topsrv_start’:
net/tipc/topsrv.c:660:2: warning: ‘strncpy’ specified bound depends on the length of the source argument [-Wstringop-overflow=]
  strncpy(srv->name, name, strlen(name) + 1);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
net/tipc/topsrv.c:660:27: note: length computed here
  strncpy(srv->name, name, strlen(name) + 1);
                           ^~~~~~~~~~~~
So change it to correct length and use strscpy.

Signed-off-by: default avatarGuoqing Jiang <gqjiang@suse.com>
Acked-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 02dc6882

net/tipc/subscr.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ int tipc_topsrv_start(struct net *net) 
	topsrv->tipc_conn_new		= tipc_subscrb_connect_cb;

	topsrv->tipc_conn_release	= tipc_subscrb_release_cb;



	strncpy(topsrv->name, name, strlen(name) + 1);

	strscpy(topsrv->name, name, sizeof(topsrv->name));

	tn->topsrv = topsrv;

	atomic_set(&tn->subscription_count, 0);