From patchwork Wed Sep 28 15:44:14 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: 9355835 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 8906F600C8 for ; Thu, 29 Sep 2016 07:57:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C33429894 for ; Thu, 29 Sep 2016 07:57:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 710BE2989A; Thu, 29 Sep 2016 07:57:08 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mx5-phx2.redhat.com (mx5-phx2.redhat.com [209.132.183.37]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1D74729894 for ; Thu, 29 Sep 2016 07:57:08 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx5-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8T7t1Zr040972; Thu, 29 Sep 2016 03:55:01 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u8SFiHc2024314 for ; Wed, 28 Sep 2016 11:44:17 -0400 Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8SFiHKT027142 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 28 Sep 2016 11:44:17 -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 6FF7E4FC; Wed, 28 Sep 2016 15:44:16 +0000 (UTC) Received: from [192.168.1.2] ([78.48.47.99]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0LiCsx-1bAhMT4A2l-00nTw8; Wed, 28 Sep 2016 17:44:15 +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: <0d5a2aa2-b713-4c2a-cfe4-9c72fe8ec44a@users.sourceforge.net> Date: Wed, 28 Sep 2016 17:44:14 +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:lcxMqqmyUKlR/nG3t78gGEcgOaRuI0TRgTqVxcQR4v0KKOsToK5 mAkgOJ0JuZj3xfqEWlZqcVMeYLxTBFDoT+H/F7g8JPh6srU+T9ajWphqdhMwJLwdJMU5QQQ GaYtO8gJb1xXLHrVIoOi4LLSp+og6wgey0iHSFKy6MgJqGpm9k0mBahFnVqOzW6ZC6u9/aL fa5v3ubdLQZnm9FQu1sBg== X-UI-Out-Filterresults: notjunk:1; V01:K0:2POm1l+kDoM=:L4ELjrvbzai2hKjqcT+LfE 5mKYcLjQEG2eYSbvQUHxU8wkfhz4KWhWxNY1qLNjgpKAdoy9T1pKmHE4AfUA5E8ysZXb6Yr6y sFXpukaGBUlti8SGsWVQTS3Bg1Y2QvrO0k/0K12XQdMZjJZy+TR5HcFSHfwaTktI1V385b7pv JmSY/rxIUjrOLxQyVHGUFSiDYzD5EXbR2r+AY4xxZ3jRSKDGO6BrTCY4rvmNnodClarUrkaLd JPOW5kxdA9UTBpxajiyEKZyqBYv8cuP+JAnpHinHcZFAjCMd5koFDlqt7az1mfyj5U6fxhwsU ca00phPcXCci5SmDFsbk32hh2GdY6WYIZ9Z+FKCp1dU15PvQPkLKk41KCIzYi2jwvQa36nmKR xnUNr60gqvjxIMjSmsKyKdUX6pplxYvlY+8h8ze/D+dHmpjEAFJ9KpcbQQW1JD8HAzDx6MbG1 CMr2gesc3Zm2mTQIZmXh00Kp6tQKIOHsn8iDq4m7sdNGJNCTmYYmHGiEnm0y1A/l43QGtOInv xz4eHKjRTOI9eubPguGLyAD1ZZWMC2VkS5+QWcBgOQ2OLg9Q0vq64uvFzJomvriisGm8MIq6m 6Fjc1MRYvPc1QYOhpCtThM18+y1MzH7am/qBT6/WWI1QPURabN7N3rCo3ATTfS7L1kOwmU8Hn OTIUEhJKdnHhaUz9Wv/D5Oss7q9aZd5e0YKBTyRySEkHqS2pbJoCl4lziARiXWZv4skYui3C3 C2BXLmoZWKObCsGRTc8WLr4pxRka8iytDJm3So2JoR1ASle5XxO85DnkAsEYEfcBHAIUNP8G9 zyB3e9k X-Greylist: Sender IP whitelisted by DNSRBL, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 28 Sep 2016 15:44:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 28 Sep 2016 15:44:16 +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.27 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 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 07/10] md/dm-crypt: Rename a jump label in crypt_iv_tcw_whitening() 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:32:15 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/md/dm-crypt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 3bc54c1..c457b5e 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -698,13 +698,13 @@ static int crypt_iv_tcw_whitening(struct crypt_config *cc, for (i = 0; i < 4; i++) { r = crypto_shash_init(desc); if (r) - goto out; + goto zero_memory; r = crypto_shash_update(desc, &buf[i * 4], 4); if (r) - goto out; + goto zero_memory; r = crypto_shash_final(desc, &buf[i * 4]); if (r) - goto out; + goto zero_memory; } crypto_xor(&buf[0], &buf[12], 4); crypto_xor(&buf[4], &buf[8], 4); @@ -712,7 +712,7 @@ static int crypt_iv_tcw_whitening(struct crypt_config *cc, /* apply whitening (8 bytes) to whole sector */ for (i = 0; i < ((1 << SECTOR_SHIFT) / 8); i++) crypto_xor(data + i * 8, buf, 8); -out: +zero_memory: memzero_explicit(buf, sizeof(buf)); return r; }