From d9eeaab65373a4a4d7511b9bac2dec90b1afed4f Mon Sep 17 00:00:00 2001 From: Michael McConville Date: Fri, 5 Feb 2016 08:36:03 +0100 Subject: [PATCH] Fix undefined signed shift overflow Originally discussed here: https://github.com/OpenVPN/openvpn/pull/42 Thanks for your time, Michael Acked-by: Gert Doering Message-Id: <20160202191122.GE1675@thinkpad.swarthmore.edu> URL: http://article.gmane.org/gmane.network.openvpn.devel/11050 Signed-off-by: Gert Doering (cherry picked from commit d4d5d9259aeba152d5969fea048267fc97ca7530) --- src/openvpn/route.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/openvpn/route.c b/src/openvpn/route.c index f35bc855b..827bd79cd 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -2639,7 +2639,8 @@ void get_default_gateway (struct route_gateway_info *rgi) { struct gc_arena gc = gc_new (); - int s, seq, l, pid, rtm_addrs, i; + int s, seq, l, pid, rtm_addrs; + unsigned int i; struct sockaddr so_dst, so_mask; char *cp = m_rtmsg.m_space; struct sockaddr *gate = NULL, *sa; @@ -2776,7 +2777,8 @@ get_default_gateway (struct route_gateway_info *rgi) struct gc_arena gc = gc_new (); struct rtmsg m_rtmsg; int sockfd = -1; - int seq, l, pid, rtm_addrs, i; + int seq, l, pid, rtm_addrs; + unsigned int i; struct sockaddr so_dst, so_mask; char *cp = m_rtmsg.m_space; struct sockaddr *gate = NULL, *ifp = NULL, *sa; @@ -2976,7 +2978,8 @@ void get_default_gateway (struct route_gateway_info *rgi) { struct gc_arena gc = gc_new (); - int s, seq, l, rtm_addrs, i; + int s, seq, l, rtm_addrs; + unsigned int i; pid_t pid; struct sockaddr so_dst, so_mask; char *cp = m_rtmsg.m_space; -- 2.47.2