Attachment 151128 Details for Bug 194672 – 3rd version - Fix advskew and advbase checks, set default advbase for new entries

[patch] 3rd version - Fix advskew and advbase checks, set default advbase for new entries

carp.diff (text/plain), 1.44 KB, created by Renato Botelho on 2014-12-30 18:58:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Renato Botelho

Created: 2014-12-30 18:58:47 UTC

Size: 1.44 KB

patch

obsolete

>Index: sbin/ifconfig/carp.c
>===================================================================
>--- sbin/ifconfig/carp.c	(revision 276358)
>+++ sbin/ifconfig/carp.c	(working copy)
>@@ -136,6 +136,7 @@
> 	bzero(&carpr, sizeof(struct carpreq));
> 	carpr.carpr_vhid = carpr_vhid;
> 	carpr.carpr_count = 1;
>+	carpr.carpr_advbase = CARP_DFLTINTV;
> 	ifr.ifr_data = (caddr_t)&carpr;
> 
> 	if (ioctl(s, SIOCGVH, (caddr_t)&ifr) == -1 && errno != ENOENT)
>Index: sys/netinet/ip_carp.c
>===================================================================
>--- sys/netinet/ip_carp.c	(revision 276358)
>+++ sys/netinet/ip_carp.c	(working copy)
>@@ -1695,21 +1695,18 @@
> 		} 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_advbase > 255 ||
>+		    carpr.carpr_advbase < CARP_DFLTINTV) {
>+			error = EINVAL;
>+			break;
> 		}
>-		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;
>+		if (carpr.carpr_advskew < 0 ||
>+		    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);

Actions: View | Diff

Attachments on bug 194672: 151093 | 151123 | 151128