From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4209F72 for ; Tue, 31 Aug 2021 18:15:18 +0000 (UTC) Received: by mail-lf1-f46.google.com with SMTP id l10so703189lfg.4 for ; Tue, 31 Aug 2021 11:15:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RAusKbpb86Vg8k5m89yF2Mh6kI0kDJIwV1Xq0hJWA0I=; b=rqrCS+RxI/ekdxKFmYlycymJSguGBQKJHXcU43HB1sHn6OPmupvwEmIsd69snQRjIx BQpqSueP5p6VI6OALuuTSnm6vHwDsTCv+Hu2X1k7fjbsGZIpOhVmZzvlD9CpofADPI76 XeXNEKcp2aGhbCBY83R+Xk6JmjABCqNg0FwVNmx1ZKbPTpIXs2ZbKyBhqBr9y+8/zE9Y 7RVUUVdyQUdCEnLIa78RfTPl9/E8y2Nvb3weD82wJvFbQNAaJnO9bL7lsJqdsgi92AHx BTdtMafN57kcKhupMB6k1NjENC0+SrchewVB/jMezkH634zHxLpTuLdAwNgYZRt7FXUr Nyyg== 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=RAusKbpb86Vg8k5m89yF2Mh6kI0kDJIwV1Xq0hJWA0I=; b=l9LiywYm0Ves+E5TZMDzybHE0O2tqykybOH0r5CLYrA+7CJghYA6HHvwBvF4XZK2GO C8iuQKobAeS7pfr+5tLLLk1NWAah8H4nfn1czH1QSmkoAgV3xe4aM/AH6zrWH5piXtxn Zj9t/E+060UX6M7Fphs+rNfBWjzrtchxH+cw9TPXFpAClEyRKbQ3hC63gdDB7IDuqXC/ IXlLp4L8XmL6Bf2TkZpIQ6ELFTSZVXRsxBBV7Cl59vQ6Lzr/zWBM+0PFLxelCtomwmJX 7x977PXmyEWuCs+VYbUuJpVeFzKjdVUhSJ5pPivdZl4Xg2sG8yCIVUC2ZELKzZW69HkR KIiA== X-Gm-Message-State: AOAM533GMv0w2Rt7De4E7Ug3IAmoFBJTBhvaStmbSGZM92L2vxDLNYCe 56oAHKsSJ7KqScYnosBcnQc= X-Google-Smtp-Source: ABdhPJzrd9aT+f5ERjLskDYJiGvaEYnZizSLZ/u+TwtTjeoh9qqRlIS4d0aR5Fn7vig9dY0U1+WHJQ== X-Received: by 2002:a05:6512:241:: with SMTP id b1mr22003224lfo.99.1630433716453; Tue, 31 Aug 2021 11:15:16 -0700 (PDT) Received: from kari-VirtualBox.telewell.oy (85-23-89-224.bb.dnainternet.fi. [85.23.89.224]) by smtp.gmail.com with ESMTPSA id z11sm2270757ljn.114.2021.08.31.11.15.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Aug 2021 11:15:16 -0700 (PDT) From: Kari Argillander To: Konstantin Komarov , ntfs3@lists.linux.dev Cc: Kari Argillander , linux-kernel@vger.kernel.org Subject: [PATCH 1/5] fs/ntfs3: Use kmalloc_array over kmalloc with multiply Date: Tue, 31 Aug 2021 21:15:01 +0300 Message-Id: <20210831181505.1074767-2-kari.argillander@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210831181505.1074767-1-kari.argillander@gmail.com> References: <20210831181505.1074767-1-kari.argillander@gmail.com> Precedence: bulk X-Mailing-List: ntfs3@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit If we do not use kmalloc_array we get checkpatch warning. It is also little safer if something goes wrong with coding. Signed-off-by: Kari Argillander --- fs/ntfs3/bitmap.c | 2 +- fs/ntfs3/index.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ntfs3/bitmap.c b/fs/ntfs3/bitmap.c index 831501555009..aa0b1ea66cd0 100644 --- a/fs/ntfs3/bitmap.c +++ b/fs/ntfs3/bitmap.c @@ -1331,7 +1331,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits) new_last = wbits; if (new_wnd != wnd->nwnd) { - new_free = kmalloc(new_wnd * sizeof(u16), GFP_NOFS); + new_free = kmalloc_array(new_wnd, sizeof(u16), GFP_NOFS); if (!new_free) return -ENOMEM; diff --git a/fs/ntfs3/index.c b/fs/ntfs3/index.c index 0daca9adc54c..7676a4a657d5 100644 --- a/fs/ntfs3/index.c +++ b/fs/ntfs3/index.c @@ -685,7 +685,7 @@ static struct NTFS_DE *hdr_find_e(const struct ntfs_index *indx, if (end > 0x10000) goto next; - offs = kmalloc(sizeof(u16) * nslots, GFP_NOFS); + offs = kmalloc_array(nslots, sizeof(u16), GFP_NOFS); if (!offs) goto next; @@ -707,7 +707,7 @@ static struct NTFS_DE *hdr_find_e(const struct ntfs_index *indx, u16 *ptr; int new_slots = ALIGN(2 * nslots, 8); - ptr = kmalloc(sizeof(u16) * new_slots, GFP_NOFS); + ptr = kmalloc_array(new_slots, sizeof(u16), GFP_NOFS); if (ptr) memcpy(ptr, offs, sizeof(u16) * max_idx); kfree(offs); -- 2.25.1