The version field defined in the audit status structure was found to have limitations in terms of its expressibility of features supported. This is distict from the get/set features call to be able to command those features that are present. Converting this field from a version number to a feature bitmap will allow distributions to selectively backport and support certain features and will allow upstream to be able to deprecate features in the future. It will allow userspace clients to first query the kernel for which features are actually present and supported. Currently, EINVAL is returned rather than EOPNOTSUP, which isn't helpful in determining if there was an error in the command, or if it simply isn't supported yet. Past features are not represented by this bitmap, but their use may be converted to EOPNOTSUP if needed in the future. Since "version" is too generic to convert with a #define, use a union in the struct status, introducing the member "feature_bitmap" unionized with "version". Convert existing AUDIT_VERSION_* macros over to AUDIT_FEATURE_BITMAP* counterparts, leaving the former for backwards compatibility.
Showing the changes to include/uapi/linux (1 of 2 files). Show all
Unified · Split
| @@ -322,9 +322,15 @@ enum { · 321 unmodified lines | |||
| 322 | #define AUDIT_STATUS_BACKLOG_LIMIT 0x0010 | 322 | #define AUDIT_STATUS_BACKLOG_LIMIT 0x0010 |
| 323 | #define AUDIT_STATUS_BACKLOG_WAIT_TIME 0x0020 | 323 | #define AUDIT_STATUS_BACKLOG_WAIT_TIME 0x0020 |
| 324 | 324 | ||
| 325 | #define AUDIT_VERSION_BACKLOG_LIMIT 1 | 325 | #define AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT 0x00000001 |
| 326 | #define AUDIT_VERSION_BACKLOG_WAIT_TIME 2 | 326 | #define AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME 0x00000002 |
| 327 | #define AUDIT_VERSION_LATEST AUDIT_VERSION_BACKLOG_WAIT_TIME | 327 | #define AUDIT_FEATURE_BITMAP_ALL (AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT | \ |
| 328 | AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME) | ||
| 329 | |||
| 330 | /* deprecated: AUDIT_VERSION_* */ | ||
| 331 | #define AUDIT_VERSION_LATEST AUDIT_FEATURE_BITMAP_ALL | ||
| 332 | #define AUDIT_VERSION_BACKLOG_LIMIT AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT | ||
| 333 | #define AUDIT_VERSION_BACKLOG_WAIT_TIME AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME | ||
| 328 | 334 | ||
| 329 | /* Failure-to-log actions */ | 335 | /* Failure-to-log actions */ |
| 330 | #define AUDIT_FAIL_SILENT 0 | 336 | #define AUDIT_FAIL_SILENT 0 |
| @@ -403,7 +409,10 @@ struct audit_status { · 72 unmodified lines | |||
| 403 | __u32 backlog_limit; /* waiting messages limit */ | 409 | __u32 backlog_limit; /* waiting messages limit */ |
| 404 | __u32 lost; /* messages lost */ | 410 | __u32 lost; /* messages lost */ |
| 405 | __u32 backlog; /* messages waiting in queue */ | 411 | __u32 backlog; /* messages waiting in queue */ |
| 406 | __u32 version; /* audit api version number */ | 412 | union { |
| 413 | __u32 version; /* deprecated: audit api version num */ | ||
| 414 | __u32 feature_bitmap; /* bitmap of kernel audit features */ | ||
| 415 | }; | ||
| 407 | __u32 backlog_wait_time;/* message queue wait timeout */ | 416 | __u32 backlog_wait_time;/* message queue wait timeout */ |
| 408 | }; | 417 | }; |
| 409 | 418 | ||