Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp578259img; Fri, 22 Mar 2019 04:25:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqyyingU/sxqc8dP4zDTjY1elCsfcc8mvTdNIIdcv8B9ZZ201+r6r0Kmdctvp2cJymTj9blm X-Received: by 2002:a17:902:8f81:: with SMTP id z1mr9179018plo.265.1553253942057; Fri, 22 Mar 2019 04:25:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553253942; cv=none; d=google.com; s=arc-20160816; b=plZYQUNroqLvUhWIgqokZznEy+BewKyxbnMKvfY0MIlyvzwCyvJ3Y0Lc8yiYiOVDPK gx0xIBMCrGoIdrQG+9kr6yicXR5ZL5IuOhwAq4Koa56R2JBnQ8rzBl6pg+ISI/N+Cbal awHvM7hao1CTEHEJ2k5PSgvNkZbQ7U+vmAkJ589DkMFTQCooukdzzsUps5LOf/UqgYu1 piAlUjGcTpBZpn0kdIt10bd8Kc8q01mktmBVKsr70cwZrtvTKca6FmCRM4R+gso1K9/c m0+d1SaWvUvEgZmNvtqrKqYRwO2LeKQ9oaVPQZN+lZWw8ZLvlKQk59ZnQGSjW2PW40jC IaXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WCLQ/0zD+NsfZEf2ZEyFLgtNfvXTCEqcUhfY9Dke4m0=; b=MUniF5YEJxfz1MlTllnODchpQfI6HZQvuV3QMp4R94p0yt20mhTsUtjnnw6QXJZOne gyXuiVaE2bdCKuARKrIRtPSH6FXRRAT3MQBGaM4ose2ed2LynkBhnCmGPwmT0gpLwAXQ PGw6rKPP16wh6XLmcchULLbZe5Yb2YwS9UDvxrZ4WShmeNyW7M5FcULU2l9IU1rTnIWo vae2G6NInPQx0ozRprEHepV7a6eEIdkVpot9XS32KHEVFUC9IXP57asgCG/1p2Y6k8Al dJsQYlVNpaoq/2P68/EkKYwSThyK9V4LCnPQDCytgiqwv2VvJzksZWV4GEGLT2YFihwH CvyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ch8sgdbi; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p17si6395426pgg.259.2019.03.22.04.25.26; Fri, 22 Mar 2019 04:25:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ch8sgdbi; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729017AbfCVLXv (ORCPT + 99 others); Fri, 22 Mar 2019 07:23:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:50834 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729011AbfCVLXt (ORCPT ); Fri, 22 Mar 2019 07:23:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EF7FE218A2; Fri, 22 Mar 2019 11:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253828; bh=78sLzpo50rTnjfafLP9V3vD7CezQqsn0r7nWs1OVm68=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ch8sgdbi/KtutVnlLMCbHOTf0zkYj4RlrcXog+UDA7BdR5nhclsx8Q6dYIj7/0nQu SI6eDp4ABPI7ix77X/03M9cJ+WVi0Cjvp33OGfv7fvUajmRE4BmquY7X+iFWpPHpd6 rsyW3u4HQWEOPRIK4jzTsuF/lzWJzUZGNSO1SC0g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, ZhangXiaoxu , Simon Horman , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 3.18 057/134] ipvs: Fix signed integer overflow when setsockopt timeout Date: Fri, 22 Mar 2019 12:14:30 +0100 Message-Id: <20190322111214.130302258@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 53ab60baa1ac4f20b080a22c13b77b6373922fd7 ] 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 Acked-by: Simon Horman Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/ipvs/ip_vs_ctl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 9b1452e8e868..444a0cb33e97 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -2182,6 +2182,18 @@ static int ip_vs_set_timeout(struct net *net, struct ip_vs_timeout_user *u) u->tcp_fin_timeout, 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(net, IPPROTO_TCP); -- 2.19.1