From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C1AC178381; Tue, 2 Jul 2024 17:16:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719940571; cv=none; b=TMXX2gLbgBfAo4Q0ZJ8PLNRLTZJ2P8gVyRLqCUJew/HGTN+2jEcnG/32C5XHme/8d42lXxFHaxvdW4khhE/R68SFHWhov8w3BGbD4nsvETpsdB+qR+qhawM4cafXSLrcJDdS0p/yPr5RjfMRgLHlK+pQhYpqj/pBzzG7PAM57pY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719940571; c=relaxed/simple; bh=ytRU+nqiiHEJuMYRw8O7tZ2rd8EEKZMv43bBTLpgbbI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jN8NV0Z0M/shogpLcQ0dKAF8XahBMv9Pd2GCB0PchfUEFcoIo2H762wLO/vfqdzGkW1/rY620/r1GkegGSEH/4vFFzWP+tYATS1+B/U/V+lpQ3HJRbA+vMi8A+dVnHdU9dp4cWbd6z+LfJVmcKNuWJu9CHrQ4rKPRfy2br54fkU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=J1XRtKHo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="J1XRtKHo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FA69C116B1; Tue, 2 Jul 2024 17:16:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719940570; bh=ytRU+nqiiHEJuMYRw8O7tZ2rd8EEKZMv43bBTLpgbbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J1XRtKHoKOPrtStWVQ3d8y4Ds3u4JyrRCQGLxLVS9CEIyyRfg1IFVwmNdFVA1FGdm yQOtKYoK2uUH18xoRsQip8dlcw6mz5h31XiWuNqWgeCt190jhdJTtFidT+WuyZZkSI PMY3NfrnVRtu8ISDwSVoA87+PrFugAVt+OWYd4ec= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Guenter Roeck , Geert Uytterhoeven , kernel test robot , Arnd Bergmann , Sasha Levin Subject: [PATCH 6.9 195/222] syscalls: fix sys_fanotify_mark prototype Date: Tue, 2 Jul 2024 19:03:53 +0200 Message-ID: <20240702170251.439719444@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702170243.963426416@linuxfoundation.org> References: <20240702170243.963426416@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann [ Upstream commit 63e2f40c9e3187641afacde4153f54b3ee4dbc8c ] My earlier fix missed an incorrect function prototype that shows up on native 32-bit builds: In file included from fs/notify/fanotify/fanotify_user.c:14: include/linux/syscalls.h:248:25: error: conflicting types for 'sys_fanotify_mark'; have 'long int(int, unsigned int, u32, u32, int, const char *)' {aka 'long int(int, unsigned int, unsigned int, unsigned int, int, const char *)'} 1924 | SYSCALL32_DEFINE6(fanotify_mark, | ^~~~~~~~~~~~~~~~~ include/linux/syscalls.h:862:17: note: previous declaration of 'sys_fanotify_mark' with type 'long int(int, unsigned int, u64, int, const char *)' {aka 'long int(int, unsigned int, long long unsigned int, int, const char *)'} On x86 and powerpc, the prototype is also wrong but hidden in an #ifdef, so it never caused problems. Add another alternative declaration that matches the conditional function definition. Fixes: 403f17a33073 ("parisc: use generic sys_fanotify_mark implementation") Cc: stable@vger.kernel.org Reported-by: Guenter Roeck Reported-by: Geert Uytterhoeven Reported-by: kernel test robot Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- include/linux/syscalls.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 1f3d710afe4d7..ac3db59a74e23 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -858,9 +858,15 @@ asmlinkage long sys_prlimit64(pid_t pid, unsigned int resource, const struct rlimit64 __user *new_rlim, struct rlimit64 __user *old_rlim); asmlinkage long sys_fanotify_init(unsigned int flags, unsigned int event_f_flags); +#if defined(CONFIG_ARCH_SPLIT_ARG64) +asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags, + unsigned int mask_1, unsigned int mask_2, + int dfd, const char __user * pathname); +#else asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags, u64 mask, int fd, const char __user *pathname); +#endif asmlinkage long sys_name_to_handle_at(int dfd, const char __user *name, struct file_handle __user *handle, int __user *mnt_id, int flag); -- 2.43.0