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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 30491C433E1 for ; Thu, 20 Aug 2020 12:06:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0DA2C207FB for ; Thu, 20 Aug 2020 12:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597925179; bh=L4IvYwq5UkZ4gqcORyZugXzOmQzrKFWDIB9HYyW+DXA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aVTI+RMHNIDKCw2xOdHXhBoPSovqiLYJmExMa/yuZ/IB5S46jAYouyAJ2we3noDcQ KhqNOmu27kDh0676wAf6P9ZDuNRPD/hgpMxM1Dxh9k8LDkCUupifuSmmQ33ANkKD9N UwAunwhBJWT7qy6uvozKBynlmo0g+jA+9Y7uFpmE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730581AbgHTMGR (ORCPT ); Thu, 20 Aug 2020 08:06:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:43742 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730241AbgHTJ6r (ORCPT ); Thu, 20 Aug 2020 05:58:47 -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 377732067C; Thu, 20 Aug 2020 09:58:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597917527; bh=L4IvYwq5UkZ4gqcORyZugXzOmQzrKFWDIB9HYyW+DXA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RDfRq0AEKtjTM/deCluh51t8JuEBMM6nNIm8eBtSKWkw5Hccuen7WhYlDwzxGAM6O YAIt3ONXAFMgxTezU8OzYVvbA/sGf1QwgQx0+gf4iokB3h8tv6SmpDXcTd+a609HJ0 m3CYoMvCaXv/ljb5BKTDZy2Bq0gGwsJnpCoUQslA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, guodeqing , Robin Murphy , Will Deacon , Sasha Levin Subject: [PATCH 4.9 035/212] arm64: csum: Fix handling of bad packets Date: Thu, 20 Aug 2020 11:20:08 +0200 Message-Id: <20200820091604.140525508@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091602.251285210@linuxfoundation.org> References: <20200820091602.251285210@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Robin Murphy [ Upstream commit 05fb3dbda187bbd9cc1cd0e97e5d6595af570ac6 ] Although iph is expected to point to at least 20 bytes of valid memory, ihl may be bogus, for example on reception of a corrupt packet. If it happens to be less than 5, we really don't want to run away and dereference 16GB worth of memory until it wraps back to exactly zero... Fixes: 0e455d8e80aa ("arm64: Implement optimised IP checksum helpers") Reported-by: guodeqing Signed-off-by: Robin Murphy Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/checksum.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/checksum.h b/arch/arm64/include/asm/checksum.h index 09f65339d66df..e6d66c508d81b 100644 --- a/arch/arm64/include/asm/checksum.h +++ b/arch/arm64/include/asm/checksum.h @@ -30,16 +30,17 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) { __uint128_t tmp; u64 sum; + int n = ihl; /* we want it signed */ tmp = *(const __uint128_t *)iph; iph += 16; - ihl -= 4; + n -= 4; tmp += ((tmp >> 64) | (tmp << 64)); sum = tmp >> 64; do { sum += *(const u32 *)iph; iph += 4; - } while (--ihl); + } while (--n > 0); sum += ((sum >> 32) | (sum << 32)); return csum_fold(sum >> 32); -- 2.25.1