Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Date:   Fri, 27 Oct 2023 13:03:20 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     John Johansen <john.johansen@canonical.com>,
        Paul Moore <paul@paul-moore.com>
Cc:     Casey Schaufler <casey@schaufler-ca.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the apparmor tree with the security
 tree
Message-ID: <20231027130320.69469330@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/E8NMYd5Jkpz=CO8k/Jo4HbF";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/E8NMYd5Jkpz=CO8k/Jo4HbF
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the apparmor tree got a conflict in:

  security/apparmor/lsm.c

between commit:

  3c3bda37ca1d ("AppArmor: Add selfattr hooks")

from the security tree and commits:

  bd7bd201ca46 ("apparmor: combine common_audit_data and apparmor_audit_dat=
a")
  d20f5a1a6e79 ("apparmor: rename audit_data->label to audit_data->subj_lab=
el")

from the apparmor tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc security/apparmor/lsm.c
index 5e16c03936b9,4d34180e9799..000000000000
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@@ -771,16 -868,11 +917,16 @@@ out
  	return error;
 =20
  fail:
- 	aad(&sa)->label =3D begin_current_label_crit_section();
+ 	ad.subj_label =3D begin_current_label_crit_section();
 -	ad.info =3D name;
 +	if (attr =3D=3D LSM_ATTR_CURRENT)
- 		aad(&sa)->info =3D "current";
++		ad.info =3D "current";
 +	else if (attr =3D=3D LSM_ATTR_EXEC)
- 		aad(&sa)->info =3D "exec";
++		ad.info =3D "exec";
 +	else
- 		aad(&sa)->info =3D "invalid";
- 	aad(&sa)->error =3D error =3D -EINVAL;
- 	aa_audit_msg(AUDIT_APPARMOR_DENIED, &sa, NULL);
- 	end_current_label_crit_section(aad(&sa)->label);
++		ad.info =3D "invalid";
+ 	ad.error =3D error =3D -EINVAL;
+ 	aa_audit_msg(AUDIT_APPARMOR_DENIED, &ad, NULL);
+ 	end_current_label_crit_section(ad.subj_label);
  	goto out;
  }
 =20

--Sig_/E8NMYd5Jkpz=CO8k/Jo4HbF
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU7GmgACgkQAVBC80lX
0GwKHQf/fYyhNZWglpRfPLqH5NJLnyHFQNiGAlc03fYpdvF2C5YcSiD7AU7UHgOG
auZCFsuuE8u6BPm5HFxC6KOmXI/MzL+dlVno4axeXoorCbz61V3bddjoDusPIuuk
Sn4nYKaNJGTNb+cqxv3otweHwTEmpIc5CChdy7sOP/afHqAGU68tMidQhG+cJqwl
vE68juprl1hYf4UIfZL5kp6G61+etDIZB7l2hXB19erP1AJ2fpGbeudbF+oDFFoh
/ojAD3GPgy+DsiRKyJ4oEa+PnFsVclyDdEeD52mRfGWhF/2czNQdn1ZV4PiNANoP
vj6cggD613uYSHijvEwvcT9tCGuCFQ==
=pcZH
-----END PGP SIGNATURE-----

--Sig_/E8NMYd5Jkpz=CO8k/Jo4HbF--