Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94de7feb authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[NETLABEL]: Compilation for CONFIG_AUDIT=n case. 



The audit_log_start() will expand into an empty do { } while (0)
construction and the audit_ctx becomes unused.

The solution: push current->audit_context into audit_log_start()
directly, since it is not required in any other place in the 
calling function.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 910d6c32

net/netlabel/netlabel_user.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -96,7 +96,6 @@ int netlbl_netlink_init(void) 
struct audit_buffer *netlbl_audit_start_common(int type,

struct audit_buffer *netlbl_audit_start_common(int type,

					       struct netlbl_audit *audit_info)

					       struct netlbl_audit *audit_info)

{

{

	struct audit_context *audit_ctx = current->audit_context;

	struct audit_buffer *audit_buf;

	struct audit_buffer *audit_buf;

	char *secctx;

	char *secctx;

	u32 secctx_len;

	u32 secctx_len;
@@ -104,7 +103,7 @@ struct audit_buffer *netlbl_audit_start_common(int type, 
	if (audit_enabled == 0)

	if (audit_enabled == 0)

		return NULL;

		return NULL;





	audit_buf = audit_log_start(audit_ctx, GFP_ATOMIC, type);

	audit_buf = audit_log_start(current->audit_context, GFP_ATOMIC, type);

	if (audit_buf == NULL)

	if (audit_buf == NULL)

		return NULL;

		return NULL;