From patchwork Mon Sep 12 18:42:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9327547 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0B16D60231 for ; Mon, 12 Sep 2016 18:42:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0124B28E74 for ; Mon, 12 Sep 2016 18:42:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E990728E76; Mon, 12 Sep 2016 18:42:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9118928E74 for ; Mon, 12 Sep 2016 18:42:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754700AbcILSmd (ORCPT ); Mon, 12 Sep 2016 14:42:33 -0400 Received: from mout.web.de ([212.227.17.12]:59264 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751099AbcILSmc (ORCPT ); Mon, 12 Sep 2016 14:42:32 -0400 Received: from [192.168.1.3] ([77.182.57.148]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0MMVu6-1bfeZJ1Jeg-008KCD; Mon, 12 Sep 2016 20:42:19 +0200 Subject: [PATCH 01/47] block-rbd: Use kmalloc_array() in rbd_header_from_disk() To: ceph-devel@vger.kernel.org, Alex Elder , Ilya Dryomov , Sage Weil References: <566ABCD9.1060404@users.sourceforge.net> <57806eb1-10ed-582e-72d0-2975e1ee967a@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <6917f8b0-6122-3b30-0dc1-0394b28a6f61@users.sourceforge.net> Date: Mon, 12 Sep 2016 20:42:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <57806eb1-10ed-582e-72d0-2975e1ee967a@users.sourceforge.net> X-Provags-ID: V03:K0:9F0InQOQhAyJi/FmIb3d2oF7iJwjwebvwhbi6S0hcNAhzdH6183 smbJOK0fjp8Tv5TM1SMYBPtT5cN+VAq1fOddo+GCDpuOCaRXBN0x6xHoq9uMeRw0xhbj1tV scaoVn25uD2miWOXA2Cp87TK84feJpgUo0RhyGsD1bKPDdzTNHlkQqmLdrJxMiZG+J6jd9R i0GthPVn5bcPs6rU53Ijw== X-UI-Out-Filterresults: notjunk:1; V01:K0:qmIR89rW7+A=:0JYglDrGgY3rG0G0ZY5J2V pPcapmdz8sJApzzOWZ5LRvi8TXCPwVe47O2dH1fPFyl2yQ3LKBTGfjZWFIv1yrZ4m5ubp3qD/ /tePOZ9eCdjCrhrHGq9RYmky7PKYt6Z/yHKjmY8tQFCA85b7tQluN8Rtf8vHCL9Mc5ux1ha0o Y6UT+1VG3/uEq8P2lu8E9UkM6Hz4jAo4nVbva9bfluDcdiKDzzy62hjFc8JwtivlWU9IwXTxj 9A67mEx7q0xK7eoF+4vIt8Qb1jGA42gO7q/Fp7JyDK34m7fbrisfC7ubmsXRseFnAYBo3su++ /jRKjK9FJ0EcbffcooumAGsQakO4h0ivubvq7FeWwxEorFldEc6SOHisGdU6CdX/oH8P2ygJV CHzE+UZEuGU6V2aSaTco39IEd56EFJmVjw3BaKXfcusXLxWgW1jPLMZkhD+MPE79nKUqnzUp2 asTT7mdrxDyG24wJmksGaCSQCVSNHxlB5RW62lSHKjawaAvfhEtZ9ZPG4gR7MT8kiAhFOQdmY gHUxLqmmWbUsll5MUzJgkhU164tuA3ymJ5Vi39/iLYvTISbmiPhogKWgvQWeuPeF3ESXk0fuJ vIlegLL6A22VvQPex7z6cHZBjQRQgkOW739dGhLHC8wb1j7xx43u/5pK6xutbg21WHKx6UgVe b/Qq1K6MkxwIf57i5DhVL65AoewMdzofFVnQoFmCaGGyc9ECBmcmDBtj4Uzy8UcUJdnJukEai Sc3jNv6/0znZkuVgZw4/QUnpbgRoE6GjnjrPEO8de3zJSh4HtiNQV+IkZpiRvWmu2xNphigTf 9HzbnAN Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sun, 11 Sep 2016 12:21:25 +0200 * A multiplication for the size determination of a memory allocation indicated that an array data structure should be processed. Thus use the corresponding function "kmalloc_array". This issue was detected by using the Coccinelle software. * Delete the local variable "size" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 35fc1da..e406c27 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -979,7 +979,6 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev, char *snap_names = NULL; u64 *snap_sizes = NULL; u32 snap_count; - size_t size; int ret = -ENOMEM; u32 i; @@ -1017,9 +1016,9 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev, goto out_err; /* ...as well as the array of their sizes. */ - - size = snap_count * sizeof (*header->snap_sizes); - snap_sizes = kmalloc(size, GFP_KERNEL); + snap_sizes = kmalloc_array(snap_count, + sizeof(*header->snap_sizes), + GFP_KERNEL); if (!snap_sizes) goto out_err;