Unverified Commit ad7fe23b authored by Aleksa Sarai's avatar Aleksa Sarai Committed by Christian Brauner
Browse files

fscontext: add custom-prefix log helpers 



Sometimes, errors associated with an fscontext come from the VFS or
otherwise outside of the filesystem driver itself. However, the default
logging of errorfc will always prefix the message with the filesystem
name.

So, add some *fcp() wrappers that allow for custom prefixes to be used
when emitting information to the fscontext log.

Signed-off-by: default avatarAleksa Sarai <cyphar@cyphar.com>
Link: https://lore.kernel.org/20250806-errorfc-mount-too-revealing-v2-1-534b9b4d45bb@cyphar.com


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 5e6de2a7

include/linux/fs_context.h

+14 −4
Original line number Diff line number Diff line
@@ -186,10 +186,12 @@ struct fc_log { 
extern __attribute__((format(printf, 4, 5)))

void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt, ...);



#define __logfc(fc, l, fmt, ...) logfc((fc)->log.log, NULL, \

					l, fmt, ## __VA_ARGS__)

#define __plog(p, l, fmt, ...) logfc((p)->log, (p)->prefix, \

					l, fmt, ## __VA_ARGS__)

#define __logfc(fc, l, fmt, ...) \

	logfc((fc)->log.log, NULL, (l), (fmt), ## __VA_ARGS__)

#define __plogp(p, prefix, l, fmt, ...) \

	logfc((p)->log, (prefix), (l), (fmt), ## __VA_ARGS__)

#define __plog(p, l, fmt, ...) __plogp(p, (p)->prefix, l, fmt, ## __VA_ARGS__)



/**

 * infof - Store supplementary informational message

 * @fc: The context in which to log the informational message
@@ -201,6 +203,8 @@ void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt, 
#define infof(fc, fmt, ...) __logfc(fc, 'i', fmt, ## __VA_ARGS__)

#define info_plog(p, fmt, ...) __plog(p, 'i', fmt, ## __VA_ARGS__)

#define infofc(fc, fmt, ...) __plog((&(fc)->log), 'i', fmt, ## __VA_ARGS__)

#define infofcp(fc, prefix, fmt, ...) \

	__plogp((&(fc)->log), prefix, 'i', fmt, ## __VA_ARGS__)



/**

 * warnf - Store supplementary warning message
@@ -213,6 +217,8 @@ void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt, 
#define warnf(fc, fmt, ...) __logfc(fc, 'w', fmt, ## __VA_ARGS__)

#define warn_plog(p, fmt, ...) __plog(p, 'w', fmt, ## __VA_ARGS__)

#define warnfc(fc, fmt, ...) __plog((&(fc)->log), 'w', fmt, ## __VA_ARGS__)

#define warnfcp(fc, prefix, fmt, ...) \

	__plogp((&(fc)->log), prefix, 'w', fmt, ## __VA_ARGS__)



/**

 * errorf - Store supplementary error message
@@ -225,6 +231,8 @@ void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt, 
#define errorf(fc, fmt, ...) __logfc(fc, 'e', fmt, ## __VA_ARGS__)

#define error_plog(p, fmt, ...) __plog(p, 'e', fmt, ## __VA_ARGS__)

#define errorfc(fc, fmt, ...) __plog((&(fc)->log), 'e', fmt, ## __VA_ARGS__)

#define errorfcp(fc, prefix, fmt, ...) \

	__plogp((&(fc)->log), prefix, 'e', fmt, ## __VA_ARGS__)



/**

 * invalf - Store supplementary invalid argument error message
@@ -237,5 +245,7 @@ void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt, 
#define invalf(fc, fmt, ...) (errorf(fc, fmt, ## __VA_ARGS__), -EINVAL)

#define inval_plog(p, fmt, ...) (error_plog(p, fmt, ## __VA_ARGS__), -EINVAL)

#define invalfc(fc, fmt, ...) (errorfc(fc, fmt, ## __VA_ARGS__), -EINVAL)

#define invalfcp(fc, prefix, fmt, ...) \

	(errorfcp(fc, prefix, fmt, ## __VA_ARGS__), -EINVAL)



#endif /* _LINUX_FS_CONTEXT_H */