Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753477AbdFSTLi (ORCPT + 2 others); Mon, 19 Jun 2017 15:11:38 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:52361 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753409AbdFSSgj (ORCPT ); Mon, 19 Jun 2017 14:36:39 -0400 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux@roeck-us.net Cc: Andrey Konovalov , "David S . Miller" , Willy Tarreau Subject: [PATCH 3.10 249/268] net/packet: fix overflow in check for tp_reserve Date: Mon, 19 Jun 2017 20:32:28 +0200 Message-Id: <1497897167-14556-250-git-send-email-w@1wt.eu> X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a In-Reply-To: <1497897167-14556-1-git-send-email-w@1wt.eu> References: <1497897167-14556-1-git-send-email-w@1wt.eu> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: From: Andrey Konovalov commit bcc5364bdcfe131e6379363f089e7b4108d35b70 upstream. When calculating po->tp_hdrlen + po->tp_reserve the result can overflow. Fix by checking that tp_reserve <= INT_MAX on assign. Signed-off-by: Andrey Konovalov Acked-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Willy Tarreau --- net/packet/af_packet.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index cea85d8..0bbb347 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3187,6 +3187,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv return -EBUSY; if (copy_from_user(&val, optval, sizeof(val))) return -EFAULT; + if (val > INT_MAX) + return -EINVAL; po->tp_reserve = val; return 0; } -- 2.8.0.rc2.1.gbe9624a