Attachment 151123 Details for Bug 194672 – 2nd attempt, fix also advbase check

[patch] 2nd attempt, fix also advbase check

carp.diff (text/plain), 1.56 KB, created by Renato Botelho on 2014-12-30 15:45:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Renato Botelho

Created: 2014-12-30 15:45:31 UTC

Size: 1.56 KB

patch

obsolete

>Index: sbin/ifconfig/carp.c
>===================================================================
>--- sbin/ifconfig/carp.c	(revision 276358)
>+++ sbin/ifconfig/carp.c	(working copy)
>@@ -62,7 +62,7 @@
> 
> static int carpr_vhid = -1;
> static int carpr_advskew = -1;
>-static int carpr_advbase = -1;
>+static int carpr_advbase = 1;
> static int carpr_state = -1;
> static unsigned char const *carpr_key;
> 
>Index: sys/netinet/ip_carp.c
>===================================================================
>--- sys/netinet/ip_carp.c	(revision 276358)
>+++ sys/netinet/ip_carp.c	(working copy)
>@@ -1670,7 +1670,8 @@
> 		if ((error = priv_check(td, PRIV_NETINET_CARP)))
> 			break;
> 		if (carpr.carpr_vhid <= 0 || carpr.carpr_vhid > CARP_MAXVHID ||
>-		    carpr.carpr_advbase < 0 || carpr.carpr_advskew < 0) {
>+		    carpr.carpr_advbase < CARP_DFLTINTV || carpr.carpr_advbase > 255 ||
>+		    carpr.carpr_advskew < 0 || carpr.carpr_advskew >= 255) {
> 			error = EINVAL;
> 			break;
> 		}
>@@ -1695,21 +1696,8 @@
> 		} else
> 			CARP_LOCK(sc);
> 		locked = 1;
>-		if (carpr.carpr_advbase > 0) {
>-			if (carpr.carpr_advbase > 255 ||
>-			    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;
>-		}
>+		sc->sc_advbase = carpr.carpr_advbase;
>+		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);

Actions: View | Diff

Attachments on bug 194672: 151093 | 151123 | 151128