public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Use unsigned constants for ICMP6 filters [BZ #22489]
@ 2020-05-11 21:09 DJ Delorie
  0 siblings, 0 replies; only message in thread
From: DJ Delorie @ 2020-05-11 21:09 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c2d0411488c68a07cc22a5dd76fa37e952d2a66b

commit c2d0411488c68a07cc22a5dd76fa37e952d2a66b
Author: Sergey <s.korolev@ndmsystems.com>
Date:   Fri Apr 24 17:18:41 2020 -0400

    Use unsigned constants for ICMP6 filters [BZ #22489]
    
    The core problem here is that the filter array elements are unsigned
    but the computed constants are signed.  This both causes a
    signededness conversion at the &= step and may cause undefined
    behavior if the MSB is being modified.  This patch uses unsigned
    constants to avoid both cases. - DJ

Diff:
---
 inet/netinet/icmp6.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/inet/netinet/icmp6.h b/inet/netinet/icmp6.h
index a75722887d..5fed0fbca1 100644
--- a/inet/netinet/icmp6.h
+++ b/inet/netinet/icmp6.h
@@ -85,16 +85,16 @@ struct icmp6_hdr
 #define ICMP6_PARAMPROB_OPTION        2 /* unrecognized IPv6 option */
 
 #define ICMP6_FILTER_WILLPASS(type, filterp) \
-	((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) == 0)
+	((((filterp)->icmp6_filt[(type) >> 5]) & (1U << ((type) & 31))) == 0)
 
 #define ICMP6_FILTER_WILLBLOCK(type, filterp) \
-	((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) != 0)
+	((((filterp)->icmp6_filt[(type) >> 5]) & (1U << ((type) & 31))) != 0)
 
 #define ICMP6_FILTER_SETPASS(type, filterp) \
-	((((filterp)->icmp6_filt[(type) >> 5]) &= ~(1 << ((type) & 31))))
+	((((filterp)->icmp6_filt[(type) >> 5]) &= ~(1U << ((type) & 31))))
 
 #define ICMP6_FILTER_SETBLOCK(type, filterp) \
-	((((filterp)->icmp6_filt[(type) >> 5]) |=  (1 << ((type) & 31))))
+	((((filterp)->icmp6_filt[(type) >> 5]) |=  (1U << ((type) & 31))))
 
 #define ICMP6_FILTER_SETPASSALL(filterp) \
 	memset (filterp, 0, sizeof (struct icmp6_filter));


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2020-05-11 21:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-11 21:09 [glibc] Use unsigned constants for ICMP6 filters [BZ #22489] DJ Delorie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).