diff options
| author | Linus Torvalds | 2021-06-30 15:22:05 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-06-30 15:22:05 -0700 |
| commit | 290fe0fa6f5a1a3374dfd03fe0eda6c43d53e6cf (patch) | |
| tree | 7c96edbe15fc7ebc340e0d411f9cdd61a7d1e907 /security | |
| parent | 6bd344e55f73f7ae671bf5c1ebe5bd814f3c4b27 (diff) | |
| parent | 0ecc617858fce305bedcf735eb18a46cb7e9921f (diff) | |
Merge tag 'audit-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit
Pull audit updates from Paul Moore:
"Another merge window, another small audit pull request.
Four patches in total: one is cosmetic, one removes an unnecessary
initialization, one renames some enum values to prevent name
collisions, and one converts list_del()/list_add() to list_move().
None of these are earth shattering and all pass the audit-testsuite
tests while merging cleanly on top of your tree from earlier today"
* tag 'audit-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
audit: remove unnecessary 'ret' initialization
audit: remove trailing spaces and tabs
audit: Use list_move instead of list_del/list_add
audit: Rename enum audit_state constants to avoid AUDIT_DISABLED redefinition
audit: add blank line after variable declarations
Diffstat (limited to 'security')
| -rw-r--r-- | security/lsm_audit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/lsm_audit.c b/security/lsm_audit.c index 82ce14933513..5a5016ef43b0 100644 --- a/security/lsm_audit.c +++ b/security/lsm_audit.c @@ -119,7 +119,6 @@ int ipv6_skb_to_auditdata(struct sk_buff *skb, return -EINVAL; ad->u.net->v6info.saddr = ip6->saddr; ad->u.net->v6info.daddr = ip6->daddr; - ret = 0; /* IPv6 can have several extension header before the Transport header * skip them */ offset = skb_network_offset(skb); |