Attachment 27005 Details for Bug 63895

[patch] igmp-fixes.patch

igmp-fixes.patch (text/plain), 2.18 KB, created by Marcus Meissner on 2004-12-13 20:32:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2004-12-13 20:32:04 UTC

Size: 2.18 KB

patch

obsolete

>* Chris Wright (chrisw@osdl.org) wrote:
>> Sounds good, I'll respin tomorrow to remove sorting and do full search.
>
>Here's the patch.
>
>===== net/ipv4/igmp.c 1.58 vs edited =====
>--- 1.58/net/ipv4/igmp.c	2004-11-09 16:44:25 -08:00
>+++ edited/net/ipv4/igmp.c	2004-12-10 15:16:17 -08:00
>@@ -1778,12 +1778,12 @@ int ip_mc_source(int add, int omode, str
> 			goto done;
> 		rv = !0;
> 		for (i=0; i<psl->sl_count; i++) {
>-			rv = memcmp(&psl->sl_addr, &mreqs->imr_multiaddr,
>+			rv = memcmp(&psl->sl_addr[i], &mreqs->imr_sourceaddr,
> 				sizeof(__u32));
>-			if (rv >= 0)
>+			if (rv == 0)
> 				break;
> 		}
>-		if (!rv)	/* source not found */
>+		if (rv)		/* source not found */
> 			goto done;
> 
> 		/* update the interface filter */
>@@ -1825,9 +1825,9 @@ int ip_mc_source(int add, int omode, str
> 	}
> 	rv = 1;	/* > 0 for insert logic below if sl_count is 0 */
> 	for (i=0; i<psl->sl_count; i++) {
>-		rv = memcmp(&psl->sl_addr, &mreqs->imr_multiaddr,
>+		rv = memcmp(&psl->sl_addr[i], &mreqs->imr_sourceaddr,
> 			sizeof(__u32));
>-		if (rv >= 0)
>+		if (rv == 0)
> 			break;
> 	}
> 	if (rv == 0)		/* address already there is an error */
>===== net/ipv6/mcast.c 1.71 vs edited =====
>--- 1.71/net/ipv6/mcast.c	2004-11-11 15:07:25 -08:00
>+++ edited/net/ipv6/mcast.c	2004-12-10 17:20:46 -08:00
>@@ -391,12 +391,12 @@ int ip6_mc_source(int add, int omode, st
> 			goto done;
> 		rv = !0;
> 		for (i=0; i<psl->sl_count; i++) {
>-			rv = memcmp(&psl->sl_addr, group,
>+			rv = memcmp(&psl->sl_addr[i], source,
> 				sizeof(struct in6_addr));
>-			if (rv >= 0)
>+			if (rv == 0)
> 				break;
> 		}
>-		if (!rv)	/* source not found */
>+		if (rv)		/* source not found */
> 			goto done;
> 
> 		/* update the interface filter */
>@@ -437,8 +437,8 @@ int ip6_mc_source(int add, int omode, st
> 	}
> 	rv = 1;	/* > 0 for insert logic below if sl_count is 0 */
> 	for (i=0; i<psl->sl_count; i++) {
>-		rv = memcmp(&psl->sl_addr, group, sizeof(struct in6_addr));
>-		if (rv >= 0)
>+		rv = memcmp(&psl->sl_addr[i], source, sizeof(struct in6_addr));
>+		if (rv == 0)
> 			break;
> 	}
> 	if (rv == 0)		/* address already there is an error */
>_______________________________________________
>Vendor Security mailing list
>Vendor Security@lst.de
>https://www.lst.de/cgi-bin/mailman/listinfo/vendor-sec

Actions: View | Diff

Attachments on bug 63895: 26775 | 26806 | 26889 | 26996 | 27005 | 27011