From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1345C282C3 for ; Thu, 24 Jan 2019 12:22:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0C9A21872 for ; Thu, 24 Jan 2019 12:22:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727622AbfAXMWY (ORCPT ); Thu, 24 Jan 2019 07:22:24 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2745 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726014AbfAXMWY (ORCPT ); Thu, 24 Jan 2019 07:22:24 -0500 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 4AE198D2C67BA4A91472; Thu, 24 Jan 2019 20:22:20 +0800 (CST) Received: from [127.0.0.1] (10.184.189.120) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.408.0; Thu, 24 Jan 2019 20:22:13 +0800 Subject: Re: [PATCH] ipvs: Fix signed integer overflow when setsockopt timeout To: Simon Horman CC: , , , , Pablo Neira Ayuso References: <1547109546-11344-1-git-send-email-zhangxiaoxu5@huawei.com> <20190114121513.mgj45pt3rrgomrqo@verge.net.au> From: "zhangxiaoxu (A)" Message-ID: Date: Thu, 24 Jan 2019 20:22:04 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: <20190114121513.mgj45pt3rrgomrqo@verge.net.au> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.184.189.120] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ping. On 1/14/2019 8:15 PM, Simon Horman wrote: > On Thu, Jan 10, 2019 at 04:39:06PM +0800, ZhangXiaoxu wrote: >> There is a UBSAN bug report as below: >> UBSAN: Undefined behaviour in net/netfilter/ipvs/ip_vs_ctl.c:2227:21 >> signed integer overflow: >> -2147483647 * 1000 cannot be represented in type 'int' >> >> Reproduce program: >> #include >> #include >> #include >> >> #define IPPROTO_IP 0 >> #define IPPROTO_RAW 255 >> >> #define IP_VS_BASE_CTL (64+1024+64) >> #define IP_VS_SO_SET_TIMEOUT (IP_VS_BASE_CTL+10) >> >> /* The argument to IP_VS_SO_GET_TIMEOUT */ >> struct ipvs_timeout_t { >> int tcp_timeout; >> int tcp_fin_timeout; >> int udp_timeout; >> }; >> >> int main() { >> int ret = -1; >> int sockfd = -1; >> struct ipvs_timeout_t to; >> >> sockfd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); >> if (sockfd == -1) { >> printf("socket init error\n"); >> return -1; >> } >> >> to.tcp_timeout = -2147483647; >> to.tcp_fin_timeout = -2147483647; >> to.udp_timeout = -2147483647; >> >> ret = setsockopt(sockfd, >> IPPROTO_IP, >> IP_VS_SO_SET_TIMEOUT, >> (char *)(&to), >> sizeof(to)); >> >> printf("setsockopt return %d\n", ret); >> return ret; >> } >> >> Return -EINVAL if the timeout value is negative or max than 'INT_MAX / HZ'. >> >> Signed-off-by: ZhangXiaoxu > > Thanks, this looks good to me. > > Pablo, could you consider applying this to nf? > > Acked-by: Simon Horman > >> --- >> net/netfilter/ipvs/ip_vs_ctl.c | 13 +++++++++++++ >> 1 file changed, 13 insertions(+) >> >> diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c >> index 432141f..444aaca 100644 >> --- a/net/netfilter/ipvs/ip_vs_ctl.c >> +++ b/net/netfilter/ipvs/ip_vs_ctl.c >> @@ -2221,6 +2221,19 @@ static int ip_vs_set_timeout(struct netns_ipvs *ipvs, struct ip_vs_timeout_user >> u->udp_timeout); >> >> #ifdef CONFIG_IP_VS_PROTO_TCP >> + if (u->tcp_timeout < 0 || u->tcp_timeout > (INT_MAX / HZ) || >> + u->tcp_fin_timeout < 0 || u->tcp_fin_timeout > (INT_MAX / HZ)) { >> + return -EINVAL; >> + } >> +#endif >> + >> +#ifdef CONFIG_IP_VS_PROTO_UDP >> + if (u->udp_timeout < 0 || u->udp_timeout > (INT_MAX / HZ)) { >> + return -EINVAL; >> + } >> +#endif >> + >> +#ifdef CONFIG_IP_VS_PROTO_TCP >> if (u->tcp_timeout) { >> pd = ip_vs_proto_data_get(ipvs, IPPROTO_TCP); >> pd->timeout_table[IP_VS_TCP_S_ESTABLISHED] >> -- >> 2.7.4 >> > > . >