@@ -2417,12 +2417,19 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)
24172417 }
24182418 }
24192419
2420+ if ((cmd == IP_VS_SO_SET_ADD || cmd == IP_VS_SO_SET_EDIT ) &&
2421+ strnlen (usvc .sched_name , IP_VS_SCHEDNAME_MAXLEN ) ==
2422+ IP_VS_SCHEDNAME_MAXLEN ) {
2423+ ret = - EINVAL ;
2424+ goto out_unlock ;
2425+ }
2426+
24202427 /* Check for valid protocol: TCP or UDP or SCTP, even for fwmark!=0 */
24212428 if (usvc .protocol != IPPROTO_TCP && usvc .protocol != IPPROTO_UDP &&
24222429 usvc .protocol != IPPROTO_SCTP ) {
2423- pr_err ("set_ctl: invalid protocol: %d %pI4:%d %s \n" ,
2430+ pr_err ("set_ctl: invalid protocol: %d %pI4:%d\n" ,
24242431 usvc .protocol , & usvc .addr .ip ,
2425- ntohs (usvc .port ), usvc . sched_name );
2432+ ntohs (usvc .port ));
24262433 ret = - EFAULT ;
24272434 goto out_unlock ;
24282435 }
@@ -2845,7 +2852,7 @@ static const struct nla_policy ip_vs_cmd_policy[IPVS_CMD_ATTR_MAX + 1] = {
28452852static const struct nla_policy ip_vs_daemon_policy [IPVS_DAEMON_ATTR_MAX + 1 ] = {
28462853 [IPVS_DAEMON_ATTR_STATE ] = { .type = NLA_U32 },
28472854 [IPVS_DAEMON_ATTR_MCAST_IFN ] = { .type = NLA_NUL_STRING ,
2848- .len = IP_VS_IFNAME_MAXLEN },
2855+ .len = IP_VS_IFNAME_MAXLEN - 1 },
28492856 [IPVS_DAEMON_ATTR_SYNC_ID ] = { .type = NLA_U32 },
28502857};
28512858
@@ -2858,7 +2865,7 @@ static const struct nla_policy ip_vs_svc_policy[IPVS_SVC_ATTR_MAX + 1] = {
28582865 [IPVS_SVC_ATTR_PORT ] = { .type = NLA_U16 },
28592866 [IPVS_SVC_ATTR_FWMARK ] = { .type = NLA_U32 },
28602867 [IPVS_SVC_ATTR_SCHED_NAME ] = { .type = NLA_NUL_STRING ,
2861- .len = IP_VS_SCHEDNAME_MAXLEN },
2868+ .len = IP_VS_SCHEDNAME_MAXLEN - 1 },
28622869 [IPVS_SVC_ATTR_PE_NAME ] = { .type = NLA_NUL_STRING ,
28632870 .len = IP_VS_PENAME_MAXLEN },
28642871 [IPVS_SVC_ATTR_FLAGS ] = { .type = NLA_BINARY ,
0 commit comments