lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 10 Jun 2017 10:04:32 +0200 From: Hannes Reinecke <hare@...e.de> To: Arnd Bergmann <arnd@...db.de>, Jens Axboe <axboe@...com> Cc: Ming Lei <tom.leiming@...il.com>, Omar Sandoval <osandov@...com>, linux-kernel@...r.kernel.org Subject: Re: [PATCH] loop: fix error handling regression On 06/09/2017 12:19 PM, Arnd Bergmann wrote: > gcc points out an unusual indentation: > > drivers/block/loop.c: In function 'loop_set_status': > drivers/block/loop.c:1149:3: error: this 'if' clause does not guard... [-Werror=misleading-indentation] > if (figure_loop_size(lo, info->lo_offset, info->lo_sizelimit, > ^~ > drivers/block/loop.c:1152:4: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' > goto exit; > > This was introduced by a new feature that accidentally moved the opening > braces from one condition to another. Adding a second pair of braces > makes it work correctly again and also more readable. > > Fixes: f2c6df7dbf9a ("loop: support 4k physical blocksize") > Signed-off-by: Arnd Bergmann <arnd@...db.de> > --- > drivers/block/loop.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/block/loop.c b/drivers/block/loop.c > index 4d376c10a97a..e288fb30100f 100644 > --- a/drivers/block/loop.c > +++ b/drivers/block/loop.c > @@ -1147,10 +1147,11 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info) > ((lo->lo_flags & LO_FLAGS_BLOCKSIZE) && > lo->lo_logical_blocksize != LO_INFO_BLOCKSIZE(info))) { > if (figure_loop_size(lo, info->lo_offset, info->lo_sizelimit, > - LO_INFO_BLOCKSIZE(info))) > + LO_INFO_BLOCKSIZE(info))) { > err = -EFBIG; > goto exit; > } > + } > > loop_config_discard(lo); > > Oops. You are correct, of course. Reviewed-by: Hannes Reinecke <hare@...e.com> Cheers, Hannes -- Dr. Hannes Reinecke zSeries & Storage hare@...e.de +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
Powered by blists - more mailing lists