| Message ID | 20220321152846.458128-1-dimitri.ledkov@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [J/linux,J/linux-unstable] UBUNTU: SAUCE: Audit: Fix incorrect static inline function declration. | expand |
On Mon, Mar 21, 2022 at 03:28:46PM +0000, Dimitri John Ledkov wrote: > The LSM attributes SAUCE patches have incorrect syntax for the case > when AUDIT framework is turned off, such as zfcpdump_defconfig. This > in turn breaks building zfcpdump-kernel from Ubuntu patched sources. > > Reproducer: > > make ARCH=s390 CROSS_COMPILE=s390x-linux-gnu- zfcpdump_defconfig > make ARCH=s390 CROSS_COMPILE=s390x-linux-gnu- bzImage > > BugLink: https://bugs.launchpad.net/bugs/1965766 > Fixes: 558fd844dd ("UBUNTU: SAUCE: Audit: Add a new record for multiple object LSM attributes") > Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> > --- > include/linux/audit.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/audit.h b/include/linux/audit.h > index 55c73ceb12..05ea137ce0 100644 > --- a/include/linux/audit.h > +++ b/include/linux/audit.h > @@ -253,7 +253,7 @@ static inline void audit_log_path_denied(int type, const char *operation) > static inline void audit_log_lsm(struct lsmblob *blob, bool exiting) > { } > static inline int audit_log_task_context(struct audit_buffer *ab, > - struct lsmblob *blob); > + struct lsmblob *blob) > { > return 0; > } > -- > 2.32.0 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/include/linux/audit.h b/include/linux/audit.h index 55c73ceb12..05ea137ce0 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -253,7 +253,7 @@ static inline void audit_log_path_denied(int type, const char *operation) static inline void audit_log_lsm(struct lsmblob *blob, bool exiting) { } static inline int audit_log_task_context(struct audit_buffer *ab, - struct lsmblob *blob); + struct lsmblob *blob) { return 0; }
The LSM attributes SAUCE patches have incorrect syntax for the case when AUDIT framework is turned off, such as zfcpdump_defconfig. This in turn breaks building zfcpdump-kernel from Ubuntu patched sources. Reproducer: make ARCH=s390 CROSS_COMPILE=s390x-linux-gnu- zfcpdump_defconfig make ARCH=s390 CROSS_COMPILE=s390x-linux-gnu- bzImage BugLink: https://bugs.launchpad.net/bugs/1965766 Fixes: 558fd844dd ("UBUNTU: SAUCE: Audit: Add a new record for multiple object LSM attributes") Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> --- include/linux/audit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)