Attachment #151123 for bug #194672

Lines 62-68 Link Here

(-)sbin/ifconfig/carp.c (-1 / +1 lines)
62		62
63	static int carpr_vhid = -1;	63	static int carpr_vhid = -1;
64	static int carpr_advskew = -1;	64	static int carpr_advskew = -1;
65	static int carpr_advbase = -1;	65	static int carpr_advbase = 1;
66	static int carpr_state = -1;	66	static int carpr_state = -1;
67	static unsigned char const *carpr_key;	67	static unsigned char const *carpr_key;
68		68




		if ((error = priv_check(td, PRIV_NETINET_CARP)))
			break;
		if (carpr.carpr_vhid <= 0 || carpr.carpr_vhid > CARP_MAXVHID ||
		    carpr.carpr_advbase < CARP_DFLTINTV || carpr.carpr_advbase > 255 ||
		    carpr.carpr_advskew < 0 || carpr.carpr_advskew >= 255) {
			error = EINVAL;
			break;
		}

		} else
			CARP_LOCK(sc);
		locked = 1;
		sc->sc_advbase = carpr.carpr_advbase;
		sc->sc_advskew = carpr.carpr_advskew;
			    carpr.carpr_advbase < CARP_DFLTINTV) {
				error = EINVAL;
				break;
			}
			sc->sc_advbase = carpr.carpr_advbase;
		}
		if (carpr.carpr_advskew > 0) {
			if (carpr.carpr_advskew >= 255) {
				error = EINVAL;
				break;
			}
			sc->sc_advskew = carpr.carpr_advskew;
		}
		if (carpr.carpr_key[0] != '\0') {
			bcopy(carpr.carpr_key, sc->sc_key, sizeof(sc->sc_key));
			carp_hmac_prepare(sc);

Return to bug 194672

Lines 1670-1676 Link Here

(-)sys/netinet/ip_carp.c (-16 / +4 lines)
1670	if ((error = priv_check(td, PRIV_NETINET_CARP)))	1670	if ((error = priv_check(td, PRIV_NETINET_CARP)))
1671	break;	1671	break;
1672	if (carpr.carpr_vhid <= 0 \|\| carpr.carpr_vhid > CARP_MAXVHID \|\|	1672	if (carpr.carpr_vhid <= 0 \|\| carpr.carpr_vhid > CARP_MAXVHID \|\|
1673	carpr.carpr_advbase < 0 \|\| carpr.carpr_advskew < 0) {	1673	carpr.carpr_advbase < CARP_DFLTINTV \|\| carpr.carpr_advbase > 255 \|\|
		1674	carpr.carpr_advskew < 0 \|\| carpr.carpr_advskew >= 255) {
1674	error = EINVAL;	1675	error = EINVAL;
1675	break;	1676	break;
1676	}	1677	}
Lines 1695-1715 Link Here
1695	} else	1696	} else
1696	CARP_LOCK(sc);	1697	CARP_LOCK(sc);
1697	locked = 1;	1698	locked = 1;
1698	if (carpr.carpr_advbase > 0) {	1699	sc->sc_advbase = carpr.carpr_advbase;
1699	if (carpr.carpr_advbase > 255 \|\|	1700	sc->sc_advskew = carpr.carpr_advskew;
1700	carpr.carpr_advbase < CARP_DFLTINTV) {
1701	error = EINVAL;
1702	break;
1703	}
1704	sc->sc_advbase = carpr.carpr_advbase;
1705	}
1706	if (carpr.carpr_advskew > 0) {
1707	if (carpr.carpr_advskew >= 255) {
1708	error = EINVAL;
1709	break;
1710	}
1711	sc->sc_advskew = carpr.carpr_advskew;
1712	}
1713	if (carpr.carpr_key[0] != '\0') {	1701	if (carpr.carpr_key[0] != '\0') {
1714	bcopy(carpr.carpr_key, sc->sc_key, sizeof(sc->sc_key));	1702	bcopy(carpr.carpr_key, sc->sc_key, sizeof(sc->sc_key));
1715	carp_hmac_prepare(sc);	1703	carp_hmac_prepare(sc);