@@ -2349,8 +2349,10 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)
23492349 struct ipvs_sync_daemon_cfg cfg ;
23502350
23512351 memset (& cfg , 0 , sizeof (cfg ));
2352- strlcpy (cfg .mcast_ifn , dm -> mcast_ifn ,
2353- sizeof (cfg .mcast_ifn ));
2352+ ret = - EINVAL ;
2353+ if (strscpy (cfg .mcast_ifn , dm -> mcast_ifn ,
2354+ sizeof (cfg .mcast_ifn )) <= 0 )
2355+ goto out_dec ;
23542356 cfg .syncid = dm -> syncid ;
23552357 ret = start_sync_thread (ipvs , & cfg , dm -> state );
23562358 } else {
@@ -2388,12 +2390,19 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)
23882390 }
23892391 }
23902392
2393+ if ((cmd == IP_VS_SO_SET_ADD || cmd == IP_VS_SO_SET_EDIT ) &&
2394+ strnlen (usvc .sched_name , IP_VS_SCHEDNAME_MAXLEN ) ==
2395+ IP_VS_SCHEDNAME_MAXLEN ) {
2396+ ret = - EINVAL ;
2397+ goto out_unlock ;
2398+ }
2399+
23912400 /* Check for valid protocol: TCP or UDP or SCTP, even for fwmark!=0 */
23922401 if (usvc .protocol != IPPROTO_TCP && usvc .protocol != IPPROTO_UDP &&
23932402 usvc .protocol != IPPROTO_SCTP ) {
2394- pr_err ("set_ctl: invalid protocol: %d %pI4:%d %s \n" ,
2403+ pr_err ("set_ctl: invalid protocol: %d %pI4:%d\n" ,
23952404 usvc .protocol , & usvc .addr .ip ,
2396- ntohs (usvc .port ), usvc . sched_name );
2405+ ntohs (usvc .port ));
23972406 ret = - EFAULT ;
23982407 goto out_unlock ;
23992408 }
@@ -2822,7 +2831,7 @@ static const struct nla_policy ip_vs_cmd_policy[IPVS_CMD_ATTR_MAX + 1] = {
28222831static const struct nla_policy ip_vs_daemon_policy [IPVS_DAEMON_ATTR_MAX + 1 ] = {
28232832 [IPVS_DAEMON_ATTR_STATE ] = { .type = NLA_U32 },
28242833 [IPVS_DAEMON_ATTR_MCAST_IFN ] = { .type = NLA_NUL_STRING ,
2825- .len = IP_VS_IFNAME_MAXLEN },
2834+ .len = IP_VS_IFNAME_MAXLEN - 1 },
28262835 [IPVS_DAEMON_ATTR_SYNC_ID ] = { .type = NLA_U32 },
28272836 [IPVS_DAEMON_ATTR_SYNC_MAXLEN ] = { .type = NLA_U16 },
28282837 [IPVS_DAEMON_ATTR_MCAST_GROUP ] = { .type = NLA_U32 },
@@ -2840,7 +2849,7 @@ static const struct nla_policy ip_vs_svc_policy[IPVS_SVC_ATTR_MAX + 1] = {
28402849 [IPVS_SVC_ATTR_PORT ] = { .type = NLA_U16 },
28412850 [IPVS_SVC_ATTR_FWMARK ] = { .type = NLA_U32 },
28422851 [IPVS_SVC_ATTR_SCHED_NAME ] = { .type = NLA_NUL_STRING ,
2843- .len = IP_VS_SCHEDNAME_MAXLEN },
2852+ .len = IP_VS_SCHEDNAME_MAXLEN - 1 },
28442853 [IPVS_SVC_ATTR_PE_NAME ] = { .type = NLA_NUL_STRING ,
28452854 .len = IP_VS_PENAME_MAXLEN },
28462855 [IPVS_SVC_ATTR_FLAGS ] = { .type = NLA_BINARY ,
0 commit comments