From patchwork Thu Jun 28 09:31:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 936019 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="CsJV600w"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41GZKs5ytrz9s1B for ; Thu, 28 Jun 2018 19:31:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935024AbeF1Jbn (ORCPT ); Thu, 28 Jun 2018 05:31:43 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:34650 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933194AbeF1Jbl (ORCPT ); Thu, 28 Jun 2018 05:31:41 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5S9OLsV037283; Thu, 28 Jun 2018 09:31:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : mime-version : content-type; s=corp-2017-10-26; bh=EgO4nUvgOrHDCaMEexaXpQ7voc6S/WGNLV3/o7vdCwM=; b=CsJV600wp87CeBHLL1BozHlJDnuO/IO0Bg5yrN4hGqhSehx0Ub3wbnWSJcbvgT6jmiAS QOBbh4XHeEY47QjjG2Zp/1RHlonXH8ySWcqW4B00avYgXRedbJbGQ+yeBumKbHT4x4NZ fgF+cyxR8xC2mz2b3hKMTnheLBksK3voez62Vgsuq05uzhQLXUe9Shl91IFOEMXZUCrU X+nx6pko9cmX5/GYGjAgJYkz2E8StGCacIN3y4h/igps8nub80f33wqcm6QW0HHgINn6 4fDy0yzlDqUhsxBjspsTv1hZv2sqwZ8JmHr33O56bi5iCosDYbNBXqTE9ioLjGgm74Zf dw== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2130.oracle.com with ESMTP id 2jum581gwe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 28 Jun 2018 09:31:34 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w5S9VXXe030928 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 28 Jun 2018 09:31:33 GMT Received: from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w5S9VW2L023355; Thu, 28 Jun 2018 09:31:32 GMT Received: from kili.mountain (/197.157.0.49) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 28 Jun 2018 02:31:32 -0700 Date: Thu, 28 Jun 2018 12:31:25 +0300 From: Dan Carpenter To: "David S. Miller" Cc: Christophe JAILLET , Kees Cook , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH net] cnic: tidy up a size calculation Message-ID: <20180628093125.6qamire66fzkv47l@kili.mountain> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: NeoMutt/20170113 (1.7.2) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8937 signatures=668703 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1806280109 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Static checkers complain that id_tbl->table points to longs and 4 bytes is smaller than sizeof(long). But the since other side is dividing by 32 instead of sizeof(long), that means the current code works fine. Anyway, it's more conventional to use the BITS_TO_LONGS() macro when we're allocating a bitmap. Signed-off-by: Dan Carpenter diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c index 30273a7717e2..4fd829b5e65d 100644 --- a/drivers/net/ethernet/broadcom/cnic.c +++ b/drivers/net/ethernet/broadcom/cnic.c @@ -660,7 +660,7 @@ static int cnic_init_id_tbl(struct cnic_id_tbl *id_tbl, u32 size, u32 start_id, id_tbl->max = size; id_tbl->next = next; spin_lock_init(&id_tbl->lock); - id_tbl->table = kcalloc(DIV_ROUND_UP(size, 32), 4, GFP_KERNEL); + id_tbl->table = kcalloc(BITS_TO_LONGS(size), sizeof(long), GFP_KERNEL); if (!id_tbl->table) return -ENOMEM;