From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757103AbcILSv5 (ORCPT ); Mon, 12 Sep 2016 14:51:57 -0400 Received: from mout.web.de ([212.227.15.4]:51491 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754297AbcILSvz (ORCPT ); Mon, 12 Sep 2016 14:51:55 -0400 Subject: [PATCH 10/47] block-rbd: One function call less in rbd_dev_image_name() after error detection 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: Date: Mon, 12 Sep 2016 20:51:45 +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> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:U1nq1UPDJfs4m5e2h6SKTGfixJ8CT+zRJOlb5K6BRXbMu2qu6Zx VyPqNolp9f9MlRosunf33ao3kKpM8ZAYXO2yKMV/O3sSBdAQArG1WhpNoA4bgozkc2m3a2+ KELefVrZveRmEDMQilPnOGnahKFueXyKmEvIVx2Mm1LPzeOCGMaNbGMZNEAVms0sNfK9468 CQFkB6O4Gflzj6nkomvfg== X-UI-Out-Filterresults: notjunk:1;V01:K0:Mzyjv+kYnps=:pVFrrgAo3Nz6Ne3osGcsTu S7/OcsYQEPJsaw5Cgs2PNRK5NUVfk5aYPnptnEViHsu+cKA5u0QfSVPXVhIkjxB+02bFFuB1N qrJ88MECo08I10gVk3wdr1xWDKufSN9hW5ZvbiJMYuSqFt8vlRCOl3jxaXUpf7ih6+nlfGouE HfX2DPCDPvX83AdTyd+byh8DNcV0ealeADc1GVx+uEuxc1mclxwcZkUNOABav5IjH/30lS1ML trHMeHvBjNSs+5T8+v/9HGHX4nGD4r4L33luYgzZHqVcq0RyqakIG0rHzMCHt2lDN4SqAdMXl 3qExqxZ6KW23jUz08dOos1gJS59/IDntaVAfqcw19aQPC/0H7yFu7Sx2cPdrZyTtSMg7wpo6d NJXTI1YEM+kjeU3wwhbdhTd4FCtsZWOBtxuQYT8Gc6zX41Fb6ZQpsuD1B11SYQ2I5pXnDJBnf mAbatCjyUg9EDRsI7gvKVrzdpOwU3zNiWGdv/4BEGFFOIlJt1+BEwxzCWginkGHT+/yLa0vze eHBCr1TBhi0f6kzdFFTTB/A9qH6uw/rOZh3R92YRvcY6wVIyNBbQdRj7+Q2cqgVBi/Dv8xfAm RcPy8qTgjBOg6D3nZhQeuHxhQu6FtHpipGxbBcuP2dUKtscWH21u/ZJhgc5Y8y0dzoFqXNFFx XymHyLGDZ6CnWrXoP0Qb5yRHGzV1aZmrQ/fgQMPpzyCPk1A3vplmjxLy1w5a9/NVe1yHZt33x 1te/IaMhnvE9ut47/oRjrIYHr/UHawWc4hbu3oI+GV3u+49coDX+Kq0duqoh/gCKaoiwckKHR X9TQzhl Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 12 Sep 2016 18:00:18 +0200 The kfree() function was called in one case by the rbd_dev_image_name() function during error handling even if the passed variable "reply_buf" contained a null pointer. Adjust jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index aac51a1..145bbcc 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5276,14 +5276,14 @@ static char *rbd_dev_image_name(struct rbd_device *rbd_dev) size = sizeof (__le32) + RBD_IMAGE_NAME_LEN_MAX; reply_buf = kmalloc(size, GFP_KERNEL); if (!reply_buf) - goto out; + goto free_id; ret = rbd_obj_method_sync(rbd_dev, RBD_DIRECTORY, "rbd", "dir_get_name", image_id, image_id_size, reply_buf, size); if (ret < 0) - goto out; + goto free_buffer; p = reply_buf; end = reply_buf + ret; @@ -5292,8 +5292,9 @@ static char *rbd_dev_image_name(struct rbd_device *rbd_dev) image_name = NULL; else dout("%s: name is %s len is %zd\n", __func__, image_name, len); -out: + free_buffer: kfree(reply_buf); + free_id: kfree(image_id); return image_name; -- 2.10.0