From c2d0411488c68a07cc22a5dd76fa37e952d2a66b Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 24 Apr 2020 17:18:41 -0400 Subject: 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 --- inet/netinet/icmp6.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'inet/netinet/icmp6.h') diff --git a/inet/netinet/icmp6.h b/inet/netinet/icmp6.h index a757228..5fed0fb 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)); -- cgit v1.1