From patchwork Fri Mar 5 12:21:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 393501 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp380002jai; Fri, 5 Mar 2021 04:26:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJyRF9GiqVqdJMz/BsPr3U7n21YR22g6dYDbHt1IJG84kQzDUbq40PL12cv5OYk2kwVLqpiY X-Received: by 2002:a17:906:2bce:: with SMTP id n14mr1912375ejg.171.1614947180341; Fri, 05 Mar 2021 04:26:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614947180; cv=none; d=google.com; s=arc-20160816; b=JB4ncZS+t1wBlx50/0cEbj4JOyNNqOSegrtKYULQGhAU6t/233D0f+ZkHKgU+QWqUg SEqmwcAVPzG+xZsAc9yfdv2+8bSqxk2Jh7ESMxpKpw/02mVv/DYtuYdLMtJUVL8vSQsZ wlHZ/NOJ3PwR8jtKBC/5FHJag/1Po59/SZfZfjnIY7hQ6xrXCvRRv+iU+4DmmB+BS+Sk 5nGaYCiaLd+WsO5sGaVkyjkgKzl0eViGD8V8guCdmFazpYdhk6bGDymem0nxX26WxcO7 qFmpPUugQrIHNRUPAKxMecaHYnJqQ0nZhWZuBWsavNOboJDvFmAI/1pUDE0MOxXAPLZS WfSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+Du6pdb4Sv1iyflUDNpv3tp7V5W5FsNbgHqum+6cv70=; b=CXNBpbmRD1cTqKyQahgywHu9WEQsJYp7V/jZCOJd2GHbWcEWzNHVtvV2OnVejKb1N6 QECmiyuCw7WYA419BYioB0fzPD55BpdFbJ9imFKybjoalJOAYX9MMV+uz8Ru6sOpK20Q RXikYjX1JweTuFtlYN5oEE2pRRZnM4O5yyyVKJ3my86Pd18QughTkCi3QMAtT4QcNkl9 xNga52IhVnERaBvFnw6mgQYzCBJy9VuAiWRX/VCAvO6dkvA2XB1zfIBojCLCxqG5BMUT 4gKZrD7gXS1qXOS4Y0dyc+3ld3ZVk6RcU83otzN0y/3h4EhBjolifzHKY4XNYg0zUyXN 6FXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iO3UC5m6; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id pg21si128314ejb.168.2021.03.05.04.26.20; Fri, 05 Mar 2021 04:26:20 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iO3UC5m6; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231185AbhCEMZs (ORCPT + 13 others); Fri, 5 Mar 2021 07:25:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:60760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229963AbhCEMZ1 (ORCPT ); Fri, 5 Mar 2021 07:25:27 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3518C6502B; Fri, 5 Mar 2021 12:25:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614947126; bh=OxObYKVvhOUek42Mgl4cl7UIyzim7W0ivwfTCF4b3AM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iO3UC5m6/ioBJS12pGLQ0EDNW40HmzUig0syp5mStvyRG+XEw2vPIj+tMTlWfWzv4 fszk/2xbnbupRMAocuOQIE7iQvgWJ2aptZs6m/awCsbJEzbcVsWuLW7fCXgMA7lkB+ vjafLy5fR6ibpYv6qgpqUDvI7URvyYHGARA7aCSU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Elder , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.11 056/104] net: ipa: avoid field overflow Date: Fri, 5 Mar 2021 13:21:01 +0100 Message-Id: <20210305120905.923306360@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305120903.166929741@linuxfoundation.org> References: <20210305120903.166929741@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alex Elder [ Upstream commit cd1150098f2cc7bd05740c105488c293f6761f5a ] It's possible that the length passed to ipa_header_size_encoded() is larger than what can be represented by the HDR_LEN field alone (starting with IPA v4.5). If we attempted that, u32_encode_bits() would trigger a build-time error. Avoid this problem by masking off high-order bits of the value encoded as the lower portion of the header length. The same sort of problem exists in ipa_metadata_offset_encoded(), so implement the same fix there. Signed-off-by: Alex Elder Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ipa/ipa_reg.h | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) -- 2.30.1 diff --git a/drivers/net/ipa/ipa_reg.h b/drivers/net/ipa/ipa_reg.h index e6b0827a244e..732e691e9aa6 100644 --- a/drivers/net/ipa/ipa_reg.h +++ b/drivers/net/ipa/ipa_reg.h @@ -408,15 +408,18 @@ enum ipa_cs_offload_en { static inline u32 ipa_header_size_encoded(enum ipa_version version, u32 header_size) { + u32 size = header_size & field_mask(HDR_LEN_FMASK); u32 val; - val = u32_encode_bits(header_size, HDR_LEN_FMASK); - if (version < IPA_VERSION_4_5) + val = u32_encode_bits(size, HDR_LEN_FMASK); + if (version < IPA_VERSION_4_5) { + /* ipa_assert(header_size == size); */ return val; + } /* IPA v4.5 adds a few more most-significant bits */ - header_size >>= hweight32(HDR_LEN_FMASK); - val |= u32_encode_bits(header_size, HDR_LEN_MSB_FMASK); + size = header_size >> hweight32(HDR_LEN_FMASK); + val |= u32_encode_bits(size, HDR_LEN_MSB_FMASK); return val; } @@ -425,15 +428,18 @@ static inline u32 ipa_header_size_encoded(enum ipa_version version, static inline u32 ipa_metadata_offset_encoded(enum ipa_version version, u32 offset) { + u32 off = offset & field_mask(HDR_OFST_METADATA_FMASK); u32 val; - val = u32_encode_bits(offset, HDR_OFST_METADATA_FMASK); - if (version < IPA_VERSION_4_5) + val = u32_encode_bits(off, HDR_OFST_METADATA_FMASK); + if (version < IPA_VERSION_4_5) { + /* ipa_assert(offset == off); */ return val; + } /* IPA v4.5 adds a few more most-significant bits */ - offset >>= hweight32(HDR_OFST_METADATA_FMASK); - val |= u32_encode_bits(offset, HDR_OFST_METADATA_MSB_FMASK); + off = offset >> hweight32(HDR_OFST_METADATA_FMASK); + val |= u32_encode_bits(off, HDR_OFST_METADATA_MSB_FMASK); return val; }