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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 49810C433E0 for ; Sat, 6 Feb 2021 03:39:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 267D964FAD for ; Sat, 6 Feb 2021 03:39:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231299AbhBFDjN (ORCPT ); Fri, 5 Feb 2021 22:39:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231503AbhBFCkk (ORCPT ); Fri, 5 Feb 2021 21:40:40 -0500 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4996FC061D7C for ; Fri, 5 Feb 2021 14:11:15 -0800 (PST) Received: by mail-il1-x12c.google.com with SMTP id q5so7221785ilc.10 for ; Fri, 05 Feb 2021 14:11:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8+ck2H8Pw6wgSCqXl5lp8F6E+5zNs1S9ypztUefo5vE=; b=dTeI9ZXkMLEbDbqLDCD7wS977KZA+JfdY7T42waiRpAhSo2UF3a0My9aGY88c5II62 1b0jcGZ7xE/D3islRRXJeTMWaX8YY1aj/OX5I/sIjX1JRkzXqwtpOodMmXJuxsRFxXoz U/86TNwxQdyatpc7p8CtGglxhKg5UdGjfeAx9bUHmPyt6ijWBWUdys9aKMa5MELwq4So wG5pl+gWqc3mR+YdOebDL38YB4NaAHBpQpXrd4AXI66bnNUxrq9gneEy8/jybvupbXwB ZSG2+arMRCiWCwEin2IVFuyzh093iXsN0KJId6yfdp+4M5HB2y++kiYXIGt1aflTtvx+ YSgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8+ck2H8Pw6wgSCqXl5lp8F6E+5zNs1S9ypztUefo5vE=; b=V1RPyfKD8lYi2y4U89RmC3hmUVs7ZmNGf24Egn3Hyst87afimk64+qCPygEpfFZeVj qQRqIjiR73/DeMgZ8JAsp3d3nlh0M9/CQnTRxKXOTywsQ40MQb7iFXN/99ibf7KI/SbY aG5AoturRTBYRu88QoAp96+D7rFD1o0Sl8HfRzoWqqkcQ0SrlHvKjHU+9iNkuk9Qovtc 1xa13WxCYBb0YV572rB3YIGbbgSqd8b0CBH36hRBJr9SPoO7jpGbAj4WbqAvRK7Or5Zh Dp1JRGj1EGTfZA1Pn121zAZTpEN8dmHabeAIYZ4e/AzaL37fXIpZHh3267vccPqFUVaz jnPQ== X-Gm-Message-State: AOAM530mdz2Cc21u2U96r/3dlZsgRI+y6lOrQYCHZVXhU9zCScnyK+lD 7BVCztA0SRVbfE2TjbZy/6O0vg== X-Google-Smtp-Source: ABdhPJwVm95SUqhwcwLsT6M8j/NKgP9CdtS4acTDh2NugOZw359IHrxU2/walljAaeqSVDR2pJwxnQ== X-Received: by 2002:a92:cbce:: with SMTP id s14mr6093470ilq.306.1612563074789; Fri, 05 Feb 2021 14:11:14 -0800 (PST) Received: from beast.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id m15sm4647171ilh.6.2021.02.05.14.11.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 14:11:14 -0800 (PST) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: elder@kernel.org, evgreen@chromium.org, bjorn.andersson@linaro.org, cpratapa@codeaurora.org, subashab@codeaurora.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 7/7] net: ipa: avoid field overflow Date: Fri, 5 Feb 2021 16:11:00 -0600 Message-Id: <20210205221100.1738-8-elder@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210205221100.1738-1-elder@linaro.org> References: <20210205221100.1738-1-elder@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/net/ipa/ipa_reg.h | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/net/ipa/ipa_reg.h b/drivers/net/ipa/ipa_reg.h index e6b0827a244ec..732e691e9aa62 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; } -- 2.20.1