From patchwork Tue May 18 11:58:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1480215 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fkvfv4zCjz9sW5; Tue, 18 May 2021 21:59:03 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1liyNE-0003tG-PX; Tue, 18 May 2021 11:58:56 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1liyMx-0003kl-S4 for kernel-team@lists.ubuntu.com; Tue, 18 May 2021 11:58:39 +0000 Received: from mail-pl1-f200.google.com ([209.85.214.200]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1liyMx-00008b-FW for kernel-team@lists.ubuntu.com; Tue, 18 May 2021 11:58:39 +0000 Received: by mail-pl1-f200.google.com with SMTP id u14-20020a170903304eb02900ec9757f3dbso3621505pla.17 for ; Tue, 18 May 2021 04:58:39 -0700 (PDT) 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; bh=fzg3g+DYC953imnuPRHBkqY1qzwyp3XX71pE0GWB7S4=; b=BNNVqEpMZfH601n6uTPcd01f4OtH/x+sUGMTdud2KtLIsf6VDUSFlhoucX6XbRY2qg Lr8/eH7KJBNR5KQBHJI3Y44yLv9SAu0/pxd79nF+5K4XpYPLsfjXZS+OeBnLmRPcXqIq pK45H8w6u2HBS0V+WucBbrjufsUqWzW7gEYO2jcnd9GEWw3L6SLZLlAjXE3AePLqwlfD KhKjNDOSOjLFwPpvwKRXsjhubusn4J6eYYkjGxjhMkeUU4gc7x5Ue8WGa0u9Ghb1OJ7v ffs5cBqRIkSbV0ZlcGvU9Q3GF+L6IiYonLE+0Qr/kuQ0Mj/Wmm+xmWEOoxtLgALviteL R5XA== X-Gm-Message-State: AOAM532NwcGylVSIsXaar/q7kRhq74IN6aBI2o68QjJCttv2upH5LYu/ tjLk7EzLGSJkmh6M92q6rSb/zgr22OniRlN9WbnlPApC+EPUC257ZJ3QMZy/zvky3yOCbhTDvjj OEcm30mxyZ7/tZaMrXKVvxKmKoCogdF76cb8YVyi6pA== X-Received: by 2002:a63:5113:: with SMTP id f19mr4671539pgb.349.1621339117863; Tue, 18 May 2021 04:58:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzonElVgSm/7pZgUlv43hns8RsuovGqpCWrF+fZQ11fMa84ehwlcvHgyte23PSttizsFynmGw== X-Received: by 2002:a63:5113:: with SMTP id f19mr4671531pgb.349.1621339117710; Tue, 18 May 2021 04:58:37 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id f83sm7225383pfa.163.2021.05.18.04.58.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 04:58:36 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 6/6][groovy:linux-azure] net: mana: Use int to check the return value of mana_gd_poll_cq() Date: Tue, 18 May 2021 05:58:08 -0600 Message-Id: <20210518115808.6166-13-tim.gardner@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210518115808.6166-1-tim.gardner@canonical.com> References: <20210518115808.6166-1-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Dexuan Cui BugLink: https://bugs.launchpad.net/bugs/1928788 mana_gd_poll_cq() may return -1 if an overflow error is detected (this should never happen unless there is a bug in the driver or the hardware). Fix the type of the variable "comp_read" by using int rather than u32. Reported-by: Dan Carpenter Fixes: ca9c54d2d6a5 ("net: mana: Add a driver for Microsoft Azure Network Adapter (MANA)") Signed-off-by: Dexuan Cui Signed-off-by: David S. Miller (cherry picked from commit d90a94680bc0a8069d93282bc5f2966d00b9c4a4) Signed-off-by: Tim Gardner --- drivers/net/ethernet/microsoft/mana/hw_channel.c | 2 +- drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.c b/drivers/net/ethernet/microsoft/mana/hw_channel.c index 0cf0322702ed..1a923fd99990 100644 --- a/drivers/net/ethernet/microsoft/mana/hw_channel.c +++ b/drivers/net/ethernet/microsoft/mana/hw_channel.c @@ -283,7 +283,7 @@ static void mana_hwc_comp_event(void *ctx, struct gdma_queue *q_self) struct hwc_rx_oob comp_data = {}; struct gdma_comp *completions; struct hwc_cq *hwc_cq = ctx; - u32 comp_read, i; + int comp_read, i; WARN_ON_ONCE(hwc_cq->gdma_cq != q_self); diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index a744ca0b6c19..04d067243457 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -1061,7 +1061,7 @@ static void mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq, static void mana_poll_rx_cq(struct mana_cq *cq) { struct gdma_comp *comp = cq->gdma_comp_buf; - u32 comp_read, i; + int comp_read, i; comp_read = mana_gd_poll_cq(cq->gdma_cq, comp, CQE_POLLING_BUFFER); WARN_ON_ONCE(comp_read > CQE_POLLING_BUFFER);