linux-kernel - [PATCH] aio: always provide ki_destruct

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <1458036631-2972900-1-git-send-email-arnd@arndb.de>
Date:	Tue, 15 Mar 2016 11:10:17 +0100
From:	Arnd Bergmann <arnd@...db.de>
To:	Benjamin LaHaise <bcrl@...ck.org>
Cc:	Arnd Bergmann <arnd@...db.de>,
	Alexander Viro <viro@...iv.linux.org.uk>,
	linux-fsdevel@...r.kernel.org, linux-aio@...ck.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH] aio: always provide ki_destruct_fn callback pointer

The newly added synchronous openat support in AIO adds a ki_destruct_fn
function pointer to struct aio_kiocb inside of a CONFIG_AIO_THREAD check
but calls it unconditionally, leading to a build error:

fs/aio.c: In function 'kiocb_free':
fs/aio.c:1101:9: error: 'struct aio_kiocb' has no member named 'ki_destruct_fn'
  if (req->ki_destruct_fn)
         ^~
fs/aio.c:1102:6: error: 'struct aio_kiocb' has no member named 'ki_destruct_fn'

This moves the declaration outside of the #ifdef, assuming that we want
to call this regardless.

Signed-off-by: Arnd Bergmann <arnd@...db.de>
Fixes: 5d3d80fcf992 ("aio: add support for in-submit openat")
---
 fs/aio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/aio.c b/fs/aio.c
index f6d7df041342..72a7e8a2f67e 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -221,8 +221,8 @@ struct aio_kiocb {
 	struct fs_struct	*ki_fs;
 	struct files_struct	*ki_files;
 	const struct cred	*ki_cred;
-	aio_destruct_fn_t	ki_destruct_fn;
 #endif
+	aio_destruct_fn_t	ki_destruct_fn;
 };
 
 /*------ sysctl variables----*/
-- 
2.7.0