From patchwork Thu Oct 21 12:23:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1544348 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=iPMyE1/N; dkim-atps=neutral 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HZmsK29FNz9sRR for ; Thu, 21 Oct 2021 23:25:25 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mdX8E-0003UJ-J9; Thu, 21 Oct 2021 12:25:14 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mdX7R-0002yZ-TZ for kernel-team@lists.ubuntu.com; Thu, 21 Oct 2021 12:24:26 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 8C34240010 for ; Thu, 21 Oct 2021 12:24:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1634819064; bh=R6D88vRs2gVExuU1mzWWikS/9F2V5Ng0mOo7pB91BtY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iPMyE1/NevhZcpSuCM4FAg/HZMB14UpbRg7h5fyP6Rg8f5FywGYCbBW5grlvo+V4c Dlb7oUYxo9DbkjmGu45y5SqBszO8dtFfMc6A+aQaOM7lOSJbvV+p+X/ywmABf5Vsis 0cS+sqket8x7LHiN82vOUTmc/VEgmvO+p9a/DfM6HOX3oqaE9C2QDfyJgf2uaQHKzg UpjNUQQBWOrD5vbV21+kMV/6SelXDNHDcwTy3sfnGeN1n3kn3ozQMAW3WDB3+PNCwG ZUSMd5dzb6NQHPa3yVRIgLJ6v3qw4N/tjL3u50zucM4fkmXu38nERxq6blyegzL8me 8+NovBSM2hemw== Received: by mail-pl1-f199.google.com with SMTP id m5-20020a170902bb8500b0013a2b785187so118166pls.11 for ; Thu, 21 Oct 2021 05:24:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R6D88vRs2gVExuU1mzWWikS/9F2V5Ng0mOo7pB91BtY=; b=dw7mEQ2LYUkkBoTaWGRe6EMG4BIbcozIGehF5BsGaQ0O0RpeEILPLekpgDarzHecCr UxvlGvGCBJHKTv3uiFcMvhVPnYS7p6bpbt8nQIUFseiKxJlHopDnjaH4jm8fFpc1NLp1 jfByj9YkH/xqlMZLWgce9Q00VljF7VexrLMEI25srTVaFz+LceZi7e7KkWMp+vnzUHIj H0fzWgW/eS/Xs0zONHchigdiBKEbyiuIKb4HrwlHFfI6GYdBQlYzw3rvA6tZm884RKRi Y/sO2K2MhHoCFR2gFwx3aFdLbwXbgsWA8YUd1OkmKwz4aH3Tyd1+POH8U6bkfaV5BAlE 8IbQ== X-Gm-Message-State: AOAM530Fx4eQUaUeL6Oe8eHNR4WHvF0Z9vnXglerIpMmb7y/tbJqr3g6 5dq1vGADAc6nx83Sj5Dl1/NVIQpbi0QrU/0UTdSw6yqcAkHKVzwHIbXuA2TJba8Z62AeRBaJKHy XABZ/tf2g7O5/6W9ClwKxVzG4UyWXC2RDKpq/AiPVZA== X-Received: by 2002:a05:6a00:1946:b0:44d:8136:a4a4 with SMTP id s6-20020a056a00194600b0044d8136a4a4mr5363410pfk.46.1634819063034; Thu, 21 Oct 2021 05:24:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOOcqo7lLcViK0qPabaD3gkWFlJahNb2kZt8Y9dlx64W/kGd3LDWXfdVIEjsyKH6orUPfQ5A== X-Received: by 2002:a05:6a00:1946:b0:44d:8136:a4a4 with SMTP id s6-20020a056a00194600b0044d8136a4a4mr5363388pfk.46.1634819062789; Thu, 21 Oct 2021 05:24:22 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id g25sm5192869pge.12.2021.10.21.05.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 05:24:22 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 07/13][Hirsute/linux-azure] net: mana: Use struct_size() in kzalloc() Date: Thu, 21 Oct 2021 06:23:48 -0600 Message-Id: <20211021122400.10390-15-tim.gardner@canonical.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211021122400.10390-1-tim.gardner@canonical.com> References: <20211021122400.10390-1-tim.gardner@canonical.com> MIME-Version: 1.0 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: "Gustavo A. R. Silva" BugLink: https://bugs.launchpad.net/bugs/1947859 Make use of the struct_size() helper instead of an open-coded version, in order to avoid any potential type mistakes or integer overflows that, in the worst scenario, could lead to heap overflows. This code was detected with the help of Coccinelle and, audited and fixed manually. Signed-off-by: Gustavo A. R. Silva Signed-off-by: David S. Miller (cherry picked from commit ea89c862f01e02ec459932c7c3113fa37aedd09a) Signed-off-by: Tim Gardner --- drivers/net/ethernet/microsoft/mana/mana_en.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 04d067243457..46aee2c49f1b 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -1387,8 +1387,7 @@ static struct mana_rxq *mana_create_rxq(struct mana_port_context *apc, gc = gd->gdma_context; - rxq = kzalloc(sizeof(*rxq) + - RX_BUFFERS_PER_QUEUE * sizeof(struct mana_recv_buf_oob), + rxq = kzalloc(struct_size(rxq, rx_oobs, RX_BUFFERS_PER_QUEUE), GFP_KERNEL); if (!rxq) return NULL;