From patchwork Thu Mar 17 09:02:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miklos Szeredi X-Patchwork-Id: 8608391 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 39C63C0553 for ; Thu, 17 Mar 2016 09:02:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56E1920279 for ; Thu, 17 Mar 2016 09:02:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73C692022A for ; Thu, 17 Mar 2016 09:02:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932932AbcCQJBX (ORCPT ); Thu, 17 Mar 2016 05:01:23 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35295 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932921AbcCQJA7 (ORCPT ); Thu, 17 Mar 2016 05:00:59 -0400 Received: by mail-wm0-f66.google.com with SMTP id l124so7700397wmf.2 for ; Thu, 17 Mar 2016 02:00:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=szeredi.hu; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GlHLD9Qkb7E7cfv9ISK0DXeilRLWxPRnFcN3PeNQyCQ=; b=H4Ap+hBCJBZbmQQ5xf5f6A25f6dXmvlC1mlbLJ3yHrPTdqwbQygR0TsWNanvDn2rp9 A+j0gFOERsr8pEod6nnewdZgUbzjEiLJ8eA6b7tcgpBEQ6/vhddKNQZNNOeREYA2kkx+ p6uz23CF+KdGRJR3YEVn3MQKxe3jVuRmKzASk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GlHLD9Qkb7E7cfv9ISK0DXeilRLWxPRnFcN3PeNQyCQ=; b=PvNU5913Ete3NQoJfkXpMM9U14wA1RX78y28+4ReNUklc8/K6GKkOTwq3ma+TqK5tO MWU3OJ9Ktl9yfMJi5bUSwTdt2MIL7JkcVe8LFjrwsv4qihN3LcAREXCLNkap6ibtrwah TiSUzASvOEPPxsjtnLj/TYQRjbolhkH2GF9izkdw9WhukAOA1MkzqaGuiNGW7QTsTwp8 3v0GrecRYkhOJfRllsCGs4V237vqQppbf9/OB2gLfk3XwGdWRoe9RHZX6Pt+AiY4g/9J czMJ1hSLYEFYjNqdsolJv7lIs706SRmm+00KFylbZF+79cd6/NJ47QfAJEl7PVw0OaEt cPaA== X-Gm-Message-State: AD7BkJLCZtPo7KIQXXtVU/2I0gWTuiAAlKhPg3TzhMs0eWrEk6KGm0PE9ctisyx9byD/qQ== X-Received: by 10.28.125.141 with SMTP id y135mr33560598wmc.83.1458205257892; Thu, 17 Mar 2016 02:00:57 -0700 (PDT) Received: from tucsk.pomaz.szeredi.hu (pool-dsl-2c-0018.externet.hu. [217.173.44.24]) by smtp.gmail.com with ESMTPSA id n66sm7110841wmg.20.2016.03.17.02.00.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Mar 2016 02:00:57 -0700 (PDT) From: Miklos Szeredi To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: dhowells@redhat.com, viro@zeniv.linux.org.uk, Daniel Axtens , Theodore Ts'o , Subject: [PATCH 4/4] ext4: use file_dentry() Date: Thu, 17 Mar 2016 10:02:03 +0100 Message-Id: <1458205323-25685-4-git-send-email-miklos@szeredi.hu> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458205323-25685-1-git-send-email-miklos@szeredi.hu> References: <1458205323-25685-1-git-send-email-miklos@szeredi.hu> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Miklos Szeredi EXT4 may be used as lower layer of overlayfs and accessing f_path.dentry can lead to a crash. Fix by replacing direct access of file->f_path.dentry with the file_dentry() accessor, which will always return a native object. Reported-by: Daniel Axtens Fixes: 4bacc9c9234c ("overlayfs: Make f_path always point to the overlay and f_inode to the underlay") Fixes: ff978b09f973 ("ext4 crypto: move context consistency check to ext4_file_open()") Signed-off-by: Miklos Szeredi Cc: Theodore Ts'o Cc: David Howells Cc: Al Viro Cc: # v4.5 --- fs/ext4/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/file.c b/fs/ext4/file.c index feb9ffc6f20d..38847f38b34a 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -380,7 +380,7 @@ static int ext4_file_open(struct inode * inode, struct file * filp) return -ENOKEY; } - dir = dget_parent(filp->f_path.dentry); + dir = dget_parent(file_dentry(filp)); if (ext4_encrypted_inode(d_inode(dir)) && !ext4_is_child_context_consistent_with_parent(d_inode(dir), inode)) { ext4_warning(inode->i_sb,