From patchwork Wed Sep 28 15:42:28 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: 9355841 X-Patchwork-Delegate: snitzer@redhat.com 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 BBC83600C8 for ; Thu, 29 Sep 2016 07:58:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE3262989A for ; Thu, 29 Sep 2016 07:58:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1F74298A2; Thu, 29 Sep 2016 07:58:22 +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 mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 51B092988E for ; Thu, 29 Sep 2016 07:58:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u8T7uFKq006285; Thu, 29 Sep 2016 03:56:15 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u8SFgWOs024246 for ; Wed, 28 Sep 2016 11:42:32 -0400 Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8SFgWaK026356 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 28 Sep 2016 11:42:32 -0400 Received: from mout.web.de (mout.web.de [212.227.17.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 65BB8624DB; Wed, 28 Sep 2016 15:42:31 +0000 (UTC) Received: from [192.168.1.2] ([78.48.47.99]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0MGzba-1bkJBX0A4I-00DrTm; Wed, 28 Sep 2016 17:42:29 +0200 To: dm-devel@redhat.com, linux-raid@vger.kernel.org, Alasdair Kergon , Mike Snitzer , Shaohua Li References: <566ABCD9.1060404@users.sourceforge.net> <7c232017-e291-fd2d-5516-26e5150d90df@users.sourceforge.net> From: SF Markus Elfring Message-ID: Date: Wed, 28 Sep 2016 17:42:28 +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: <7c232017-e291-fd2d-5516-26e5150d90df@users.sourceforge.net> X-Provags-ID: V03:K0:VpQ9M4/W7scA7Mcs7I5D+XNx84ozgDQlFb7QvEDca19rFGq3QQc fk3IyPN6FQQ+IXNJJQHVDlzBgeFrdRZFQVzl69Jozsqy6FgzKOB994M7Se7YiJzoGCN398A Fxsq48sJSmO7dE9hXz1BDnb7jmzwF3LmpI0sGUgKI40voPdqYGKrpVri8RuxBZEPijp2TP7 lPlQlPNvHR3A9uQbi43Jw== X-UI-Out-Filterresults: notjunk:1; V01:K0:nkWgXoRykFk=:DQ+RTTTt4mXkupu+6eiY6Z 40jP0uSXZHI41j4PLMhCwMKXf0wAVU3bKxMULw6wcBjrR1cLm992VACdXNy+c3h2VpfWvkiIO 9ixM/FdckQhx5meoqkI2N7xrcQDdPtQ12gHZLmp1lFQBQvOmEvztFXDuvDEgybrZ6toquuSm0 9+N04nBAexgUf7gLsTWhsnDFWW9KR4+fBBDYdR/na9HAzjhr8nWneE1oT5pF+oqOrfmtS7raW wXHMpf8N05V+CfFzZ0Z/wS12TTzFYL6IJUC2kLQydvO51h27qyvLeH9HPP07OdMDws46KmN3y 1NhIs1wCMPOWQTxfw8V/D1FQwPf9Qf4Rr5/eX09xzjjfF1tUQW73rH+GycEpnnWHPtK6L3DrT JP+XVNXQ0x89P1L8K/dyQKHm68zuJqCUGNG6EpqMWj40g8dtK4oWEbjo1EpENizZhH38Ku7x3 LG0hiIVl18xiTC+es1VdAthUq+wMKKdXbjhDk1+8pKqJCsnYFAvh59eT8/3C1J76L8TvzkKfR Ltsqxw70rb88zuhSQ+eb/1C/3apXBDvdnQTiGN4hnOB77r7FymXQfWbYLoR/3PpT95hkynzdF NPtwCj5qwUw1qJYaJ1asYPUsORKBocYs+1etIx4RhFeAln+CBE8bXuyqwwmwiBC8pFdSaMREa Jv3twxbrMgo4Q00GYJwvxqtGoZTQNFxilxz3vAFMpWFpyYfryN3CU3ndbQbMmJHHgbNEwUYJD FG4LXqywVoY2HJbNHbfI0APBhiUYQGO0e/n5SYqrHGzBq2wa6ywyHp8ML4SvYTOHZ3I4zme3W fh7hF1p X-Greylist: Sender IP whitelisted by DNSRBL, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 28 Sep 2016 15:42:31 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 28 Sep 2016 15:42:31 +0000 (UTC) for IP:'212.227.17.12' DOMAIN:'mout.web.de' HELO:'mout.web.de' FROM:'elfring@users.sourceforge.net' RCPT:'' X-RedHat-Spam-Score: 0.079 (BAYES_50, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 212.227.17.12 mout.web.de 212.227.17.12 mout.web.de X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-loop: dm-devel@redhat.com X-Mailman-Approved-At: Thu, 29 Sep 2016 03:54:16 -0400 Cc: Julia Lawall , kernel-janitors@vger.kernel.org, LKML Subject: [dm-devel] [PATCH 05/10] md/dm-crypt: Rename a jump label in crypt_set_key() X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Wed, 28 Sep 2016 15:21:18 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/md/dm-crypt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 7778e9b..7e0fd82 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -1496,20 +1496,19 @@ static int crypt_set_key(struct crypt_config *cc, char *key) /* The key size may not be changed. */ if (cc->key_size != (key_string_len >> 1)) - goto out; + goto set_memory; /* Hyphen (which gives a key_size of zero) means there is no key. */ if (!cc->key_size && strcmp(key, "-")) - goto out; + goto set_memory; if (cc->key_size && crypt_decode_key(cc->key, key, cc->key_size) < 0) - goto out; + goto set_memory; set_bit(DM_CRYPT_KEY_VALID, &cc->flags); r = crypt_setkey_allcpus(cc); - -out: +set_memory: /* Hex key string not needed after here, so wipe it. */ memset(key, '0', key_string_len);