Return-Path: From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Biggers , Al Viro Subject: [PATCH 3.15 34/42] vfs: fix check for fallocate on active swapfile Date: Tue, 5 Aug 2014 11:13:48 -0700 Message-Id: <20140805181322.031151354@linuxfoundation.org> In-Reply-To: <20140805181321.018370988@linuxfoundation.org> References: <20140805181321.018370988@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Biggers commit 6d2b6170c8914c6c69256b687651fb16d7ec3e18 upstream. Fix the broken check for calling sys_fallocate() on an active swapfile, introduced by commit 0790b31b69374ddadefe ("fs: disallow all fallocate operation on active swapfile"). Signed-off-by: Eric Biggers Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman --- fs/open.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/fs/open.c +++ b/fs/open.c @@ -263,11 +263,10 @@ int do_fallocate(struct file *file, int return -EPERM; /* - * We can not allow to do any fallocate operation on an active - * swapfile + * We cannot allow any fallocate operation on an active swapfile */ if (IS_SWAPFILE(inode)) - ret = -ETXTBSY; + return -ETXTBSY; /* * Revalidate the write permissions, in case security policy has