Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp238110ybg; Thu, 17 Oct 2019 22:09:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqzovUkzAfE4Y6ANQDoJkp5/HPAVHHAcMR9pfZTPa1mnnTC/6vDiWVH1M1BtCghke9aEPcnk X-Received: by 2002:a17:907:101b:: with SMTP id ox27mr7078075ejb.130.1571375395088; Thu, 17 Oct 2019 22:09:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571375395; cv=none; d=google.com; s=arc-20160816; b=YbfEnAe8Wl58TTZz69PmhZIINNmtIf2F407i63SqM2Q7iQlOo7aHEMmb2og7nUUy/j JhmuSJrrW9wlbICOgxagYCETJbnaIvkoO0w1l/RAgUSBwelVwMRAt28MfnY4m1NeE/Qa kGdRCxtVQe+vi6CRiukBqUuZ8pw32n5jqjIJsBcW2/8YoKQGzfuZB4g/MooJhvl/qAVR TLNDsKuddAbQlmO5/YUZ55DTiikXbd47sptV0PqiM154eoZSHVbgivxX8Uubb3Tq39/k Gokz1iwfyI1zqVnxOaGxjVGrVknJ539b7Ersn5q55pSN0ySWFCmLzsXniP6kNKqa9Pkv EHnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xZjb1e2bsMUCUINv/ySznrL/gUQmCU+unFZBGvvrDAk=; b=eBKd85I+lIgJb1XyG4OXxc/HCNO3nNYNdl8IFUqRsrt+JDSOlyY/UG0V1ZviiCvl0B mGpioz8oaDdM9mSpBy9GzKDEk6YNIUug9ZEmPc74l3EEfrrzPyfr8Fg5NXKtTqvhgtfZ vZra12WQvlIvSzXTgYcEE7huBN+oiyb3cD0QIAT5cH4rtDRI2z0tXM8Ok6skOhEto7hw 8yYqPCyH5zv03/ypqPqVVBpvXGumpqi1Ls9x5uH+aJh/qhqyo/MvollKW796LTZKFWGI fsfrzQNOcWOxT+OaMdY98sCka0Jj9WEFeSyVh8BbfPTZsE/b9OAM6FXgpjoEKb8GLdNS LtKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="zv/5tz61"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v14si3497326ede.424.2019.10.17.22.09.32; Thu, 17 Oct 2019 22:09:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="zv/5tz61"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394858AbfJPWXc (ORCPT + 99 others); Wed, 16 Oct 2019 18:23:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:41374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436974AbfJPVw4 (ORCPT ); Wed, 16 Oct 2019 17:52:56 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 50A5720872; Wed, 16 Oct 2019 21:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262775; bh=VBpfkg9+vEMeWQ1VwqaiwwHBY3ZYF105rVStb5Nnl4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zv/5tz61XmLtZe5HJPueJKPFzs+2RV2PAriqGbALD/IfzhbKDbzZUf69dYWAIlUJj UKRbQSZQun5w9+vsRwh97a/UeE2l1hCtE2sW9dYT15o43zlN/iY2gLKFcAd7mP3pHX xti1Fq0yDshD1RD3K6vZ9maeRxoBWmk5/DMXzBE0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Luis Henriques , Jeff Layton , Ilya Dryomov , Sasha Levin Subject: [PATCH 4.4 16/79] ceph: fix directories inode i_blkbits initialization Date: Wed, 16 Oct 2019 14:49:51 -0700 Message-Id: <20191016214744.815526346@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Luis Henriques [ Upstream commit 750670341a24cb714e624e0fd7da30900ad93752 ] When filling an inode with info from the MDS, i_blkbits is being initialized using fl_stripe_unit, which contains the stripe unit in bytes. Unfortunately, this doesn't make sense for directories as they have fl_stripe_unit set to '0'. This means that i_blkbits will be set to 0xff, causing an UBSAN undefined behaviour in i_blocksize(): UBSAN: Undefined behaviour in ./include/linux/fs.h:731:12 shift exponent 255 is too large for 32-bit type 'int' Fix this by initializing i_blkbits to CEPH_BLOCK_SHIFT if fl_stripe_unit is zero. Signed-off-by: Luis Henriques Reviewed-by: Jeff Layton Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- fs/ceph/inode.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index a663b676d5661..2ad3f4ab4dcfa 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -725,7 +725,12 @@ static int fill_inode(struct inode *inode, struct page *locked_page, ci->i_version = le64_to_cpu(info->version); inode->i_version++; inode->i_rdev = le32_to_cpu(info->rdev); - inode->i_blkbits = fls(le32_to_cpu(info->layout.fl_stripe_unit)) - 1; + /* directories have fl_stripe_unit set to zero */ + if (le32_to_cpu(info->layout.fl_stripe_unit)) + inode->i_blkbits = + fls(le32_to_cpu(info->layout.fl_stripe_unit)) - 1; + else + inode->i_blkbits = CEPH_BLOCK_SHIFT; if ((new_version || (new_issued & CEPH_CAP_AUTH_SHARED)) && (issued & CEPH_CAP_AUTH_EXCL) == 0) { -- 2.20.1