Skip to content

Commit 58d51a5

Browse files
committed
revert attribute
1 parent f3a49fe commit 58d51a5

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

audisp/queue.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@
4242
* the index alone does not guarantee exclusive access to a ring buffer entry.
4343
* A compare‑exchange or other reservation mechanism (or simply a mutex) is
4444
* required to make the queue race‑free. However, auditd is the only producer
45-
* and audisp is the only consumer, so the queue is safe in practice. The
46-
* enqueue() entry point is annotated with AUDIT_SINGLE_PRODUCER_FUNC to make
47-
* this contract visible to thread-safety tooling.
45+
* and audisp is the only consumer, so the queue is safe in practice.
4846
*/
4947

5048
static volatile event_t **q;
@@ -225,7 +223,7 @@ static int do_overflow_action(struct disp_conf *config)
225223
* when processing is suspended, and
226224
* -1 on other errors
227225
*/
228-
AUDIT_SINGLE_PRODUCER_FUNC int enqueue(event_t *e, struct disp_conf *config)
226+
int enqueue(event_t *e, struct disp_conf *config)
229227
{
230228
unsigned int n, retry_cnt = 0;
231229

common/common.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* common.h -- common utility functions used throughout
2-
* Copyright 2018-24 Red Hat Inc.
2+
* Copyright 2018-25 Red Hat Inc.
33
* All Rights Reserved.
44
*
55
* This library is free software; you can redistribute it and/or
@@ -43,12 +43,6 @@
4343
# define AUDIT_ATOMIC_LOAD(var) (var)
4444
#endif
4545

46-
#if __has_attribute(no_thread_safety_analysis)
47-
# define AUDIT_SINGLE_PRODUCER_FUNC __attribute__((no_thread_safety_analysis))
48-
#else
49-
# define AUDIT_SINGLE_PRODUCER_FUNC
50-
#endif
51-
5246
// Used in auditd-event.c and audisp.c to size buffers for formatting
5347
#define FORMAT_BUF_LEN (MAX_AUDIT_MESSAGE_LENGTH + _POSIX_HOST_NAME_MAX)
5448

0 commit comments

Comments
 (0)