Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422671AbbEVJEQ (ORCPT ); Fri, 22 May 2015 05:04:16 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:35410 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757318AbbEVJAd (ORCPT ); Fri, 22 May 2015 05:00:33 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Patrick McHardy , Pablo Neira Ayuso , Luis Henriques Subject: [PATCH 3.16.y-ckt 122/129] netfilter: nf_tables: check for overflow of rule dlen field Date: Fri, 22 May 2015 09:58:27 +0100 Message-Id: <1432285114-9254-123-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432285114-9254-1-git-send-email-luis.henriques@canonical.com> References: <1432285114-9254-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1301 Lines: 38 3.16.7-ckt12 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Patrick McHardy commit 9889840f5988ecfd43b00c9abb83c1804e21406b upstream. Check that the space required for the expressions doesn't exceed the size of the dlen field, which would lead to the iterators crashing. Signed-off-by: Patrick McHardy Signed-off-by: Pablo Neira Ayuso Signed-off-by: Luis Henriques --- net/netfilter/nf_tables_api.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index e8624c751ec6..41abb8281a4c 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1794,6 +1794,10 @@ static int nf_tables_newrule(struct sock *nlsk, struct sk_buff *skb, n++; } } + /* Check for overflow of dlen field */ + err = -EFBIG; + if (size >= 1 << 12) + goto err1; if (nla[NFTA_RULE_USERDATA]) ulen = nla_len(nla[NFTA_RULE_USERDATA]); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/