Merge tag 'Smack-for-5.18' of https://github.com/cschaufler/smack-next

2c5a5358 · Linus Torvalds <[email protected]> · 2022-03-21 20:42:32 -07:00

Pull smack update from Casey Schaufler:
 "A single fix to repair an incorrect use of ntohs() in IPv6 audit code.
  It's very minor and went unnoticed until lkp found it.

  It's been in next and passes all tests"

* tag 'Smack-for-5.18' of https://github.com/cschaufler/smack-next:
  Fix incorrect type in assignment of ipv6 port for audit

Commit: 2c5a5358feff2c1e035a67a9b352c4358e669e5b
Parents: 6ca014cd · a5cd1ab7

Merge commit. Changes below are compared with the first parent: 6ca014cd.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
security/smack/smack_lsm.c	modified	+1	−1	View file

security/smack/smack_lsm.c

View file

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 14b279c..6207762 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2510,7 +2510,7 @@ static int smk_ipv6_check(struct smack_known *subject,
 #ifdef CONFIG_AUDIT
 	smk_ad_init_net(&ad, __func__, LSM_AUDIT_DATA_NET, &net);
 	ad.a.u.net->family = PF_INET6;
-	ad.a.u.net->dport = ntohs(address->sin6_port);
+	ad.a.u.net->dport = address->sin6_port;
 	if (act == SMK_RECEIVING)
 		ad.a.u.net->v6info.saddr = address->sin6_addr;
 	else