From patchwork Sat Nov 7 15:50:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuo Handa X-Patchwork-Id: 541340 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 27615140311 for ; Sun, 8 Nov 2015 02:51:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753704AbbKGPvK (ORCPT ); Sat, 7 Nov 2015 10:51:10 -0500 Received: from www262.sakura.ne.jp ([202.181.97.72]:35639 "EHLO www262.sakura.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753608AbbKGPvH (ORCPT ); Sat, 7 Nov 2015 10:51:07 -0500 Received: from fsav410.sakura.ne.jp (fsav410.sakura.ne.jp [133.242.250.109]) by www262.sakura.ne.jp (8.14.5/8.14.5) with ESMTP id tA7Foxe0054955; Sun, 8 Nov 2015 00:50:59 +0900 (JST) (envelope-from penguin-kernel@I-love.SAKURA.ne.jp) Received: from www262.sakura.ne.jp (202.181.97.72) by fsav410.sakura.ne.jp (F-Secure/fsigk_smtp/522/fsav410.sakura.ne.jp); Sun, 08 Nov 2015 00:50:59 +0900 (JST) X-Virus-Status: clean(F-Secure/fsigk_smtp/522/fsav410.sakura.ne.jp) Received: from ccsecurity.localdomain (softbank126074231104.bbtec.net [126.74.231.104]) (authenticated bits=0) by www262.sakura.ne.jp (8.14.5/8.14.5) with ESMTP id tA7FosEj054931 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Sun, 8 Nov 2015 00:50:59 +0900 (JST) (envelope-from penguin-kernel@I-love.SAKURA.ne.jp) From: Tetsuo Handa To: edumazet@google.com Cc: netdev@vger.kernel.org, Tetsuo Handa Subject: [PATCH] tcp: use kmalloc() than kmalloc_array(). Date: Sun, 8 Nov 2015 00:50:39 +0900 Message-Id: <1446911439-9235-1-git-send-email-penguin-kernel@I-love.SAKURA.ne.jp> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 095dc8e0c3686d58 ("tcp: fix/cleanup inet_ehash_locks_alloc()") silently changed from kmalloc() to kmalloc_array(). The latter has overflow check whereas the former doesn't have. If nblocks * locksz might overflow, we need to do like - if (!hashinfo->ehash_locks && nblocks > SIZE_MAX / locksz) + if (!hashinfo->ehash_locks && nblocks > SIZE_MAX / locksz) hashinfo->ehash_locks = vmalloc(nblocks * locksz); because kmalloc_array() detects overflow and returns NULL. But if nblocks * locksz is guaranteed not to overflow, there is no need to use kmalloc_array(). Since I assume it won't overflow, use kmalloc() than kmalloc_array(). Signed-off-by: Tetsuo Handa --- net/ipv4/inet_hashtables.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index ccc5980..8f4ab27 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -648,8 +648,8 @@ int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo) /* no more locks than number of hash buckets */ nblocks = min(nblocks, hashinfo->ehash_mask + 1); - hashinfo->ehash_locks = kmalloc_array(nblocks, locksz, - GFP_KERNEL | __GFP_NOWARN); + hashinfo->ehash_locks = kmalloc(nblocks * locksz, + GFP_KERNEL | __GFP_NOWARN); if (!hashinfo->ehash_locks) hashinfo->ehash_locks = vmalloc(nblocks * locksz);