From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2130) id 6EAA9385E830; Mon, 11 May 2020 21:09:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6EAA9385E830 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: DJ Delorie To: glibc-cvs@sourceware.org Subject: [glibc] Use unsigned constants for ICMP6 filters [BZ #22489] X-Act-Checkin: glibc X-Git-Author: Sergey X-Git-Refname: refs/heads/master X-Git-Oldrev: 6fcb0272f76721a45e33061404120907e8c5dae4 X-Git-Newrev: c2d0411488c68a07cc22a5dd76fa37e952d2a66b Message-Id: <20200511210931.6EAA9385E830@sourceware.org> Date: Mon, 11 May 2020 21:09:31 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2020 21:09:31 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c2d0411488c68a07cc22a5dd76fa37e952d2a66b commit c2d0411488c68a07cc22a5dd76fa37e952d2a66b Author: Sergey 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));