linux-kernel - linux-next: manual merge of the vfs tree with the ext3 tree

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]

Date:   Mon, 26 Sep 2022 14:01:37 +0100
From:   broonie@...nel.org
To:     Al Viro <viro@...IV.linux.org.uk>
Cc:     Gaosheng Cui <cuigaosheng1@...wei.com>, Jan Kara <jack@...e.cz>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the vfs tree with the ext3 tree

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/notify/fanotify/fanotify.h

between commit:

  7a80bf902d2bc ("fanotify: Remove obsoleted fanotify_event_has_path()")

from the ext3 tree and commit:

  d5bf88895f246 ("fs/notify: constify path")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc fs/notify/fanotify/fanotify.h
index b34246c6ec87e,bf6d4d38afa04..0000000000000
--- a/fs/notify/fanotify/fanotify.h
+++ b/fs/notify/fanotify/fanotify.h
@@@ -452,7 -452,13 +452,7 @@@ static inline bool fanotify_is_error_ev
  	return mask & FAN_FS_ERROR;
  }
  
- static inline struct path *fanotify_event_path(struct fanotify_event *event)
 -static inline bool fanotify_event_has_path(struct fanotify_event *event)
 -{
 -	return event->type == FANOTIFY_EVENT_TYPE_PATH ||
 -		event->type == FANOTIFY_EVENT_TYPE_PATH_PERM;
 -}
 -
+ static inline const struct path *fanotify_event_path(struct fanotify_event *event)
  {
  	if (event->type == FANOTIFY_EVENT_TYPE_PATH)
  		return &FANOTIFY_PE(event)->path;