From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f66.google.com ([74.125.82.66]:33395 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751959AbcCLNDF (ORCPT ); Sat, 12 Mar 2016 08:03:05 -0500 Received: by mail-wm0-f66.google.com with SMTP id n186so7004508wmn.0 for ; Sat, 12 Mar 2016 05:03:04 -0800 (PST) Date: Sat, 12 Mar 2016 14:04:15 +0100 From: Miklos Szeredi To: stable@vger.kernel.org Cc: rui.y.wang@intel.com, koct9i@gmail.com Subject: [PATCH for v4.4] ovl: fix getcwd() failure after unsuccessful rmdir Message-ID: <20160312130415.GL8655@tucsk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: stable-owner@vger.kernel.org List-ID: From: Rui Wang Date: Fri, 8 Jan 2016 23:09:59 +0800 commit ce9113bbcbf45a57c082d6603b9a9f342be3ef74 upstream. ovl_remove_upper() should do d_drop() only after it successfully removes the dir, otherwise a subsequent getcwd() system call will fail, breaking userspace programs. This is to fix: https://bugzilla.kernel.org/show_bug.cgi?id=110491 Signed-off-by: Rui Wang Reviewed-by: Konstantin Khlebnikov Signed-off-by: Miklos Szeredi Cc: --- fs/overlayfs/dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/overlayfs/dir.c +++ b/fs/overlayfs/dir.c @@ -618,7 +618,8 @@ static int ovl_remove_upper(struct dentr * sole user of this dentry. Too tricky... Just unhash for * now. */ - d_drop(dentry); + if (!err) + d_drop(dentry); mutex_unlock(&dir->i_mutex); return err;