From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 089BFC0018C for ; Sun, 29 Oct 2023 21:10:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230329AbjJ2VKB (ORCPT ); Sun, 29 Oct 2023 17:10:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229512AbjJ2VJ7 (ORCPT ); Sun, 29 Oct 2023 17:09:59 -0400 Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B02A9BC; Sun, 29 Oct 2023 14:09:56 -0700 (PDT) Received: from [10.8.192.2] (unknown [50.39.103.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 622423F1FB; Sun, 29 Oct 2023 21:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1698613794; bh=dGClXk9EY5AHSyaW5Xw39OJfNx1tcK12x9rgTjVKDk0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=ItFS9TtzrjgjJ5wA/KMQDlqtvn1qsyx8QzcF9TMtGhgF8dgpip7OBeLGSbcagx8qH bR4Z6BqCbwHUZ6ybr18tCfsDlMBHojtXORiiU5Q1RF9Y2k6DIKk6reO3uQbhENXWmS EEKWahmTKmI3Jl2K1gNhyxp2cpSYL07zXaRGcHjnwzXyBjkJFjc3u7qI0Em/XHP8us wvI1lP15ZlaE0eQkATZUgz408g2PGaBJlVaH0B493uTwLJlqBtuIE8pLQmL+ICywOj UKj9SsRB2NDd3OqwafuAoS92udGFoCImnHcLrhB1HhFBPR+9Bh6U11IWgH6yEuCgZi +Bq1xLIp5vjLA== Message-ID: <4b4eb40c-b65a-46e2-9e23-5412a9cdcad0@canonical.com> Date: Sun, 29 Oct 2023 14:09:47 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: manual merge of the apparmor tree with the security tree Content-Language: en-US To: Paul Moore , Stephen Rothwell Cc: Casey Schaufler , Linux Kernel Mailing List , Linux Next Mailing List , linux-security-module@vger.kernel.org References: <20231027130320.69469330@canb.auug.org.au> From: John Johansen Autocrypt: addr=john.johansen@canonical.com; keydata= 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 lT9Q Organization: Canonical In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/28/23 08:32, Paul Moore wrote: > On Thu, Oct 26, 2023 at 10:03 PM Stephen Rothwell wrote: >> >> 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_data") >> d20f5a1a6e79 ("apparmor: rename audit_data->label to audit_data->subj_label") >> >> 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. > > Thanks Stephen. > > John, can you take a look and make sure this is correct (it looks okay to me)? > yes its good, thanks Stephan. Acked-by: John Johansen Paul just to double check, to make sure we get ordering on this right 3c3bda37ca1d ("AppArmor: Add selfattr hooks") is part of the Three basic syscalls series, the plan is still to have that series bake in next for a full cycle? Regardless, I will wait until security-ext gets merged to send my pull request, and handle the conflict if its present. >> 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; >> >> fail: >> - aad(&sa)->label = begin_current_label_crit_section(); >> + ad.subj_label = begin_current_label_crit_section(); >> - ad.info = name; >> + if (attr == LSM_ATTR_CURRENT) >> - aad(&sa)->info = "current"; >> ++ ad.info = "current"; >> + else if (attr == LSM_ATTR_EXEC) >> - aad(&sa)->info = "exec"; >> ++ ad.info = "exec"; >> + else >> - aad(&sa)->info = "invalid"; >> - aad(&sa)->error = error = -EINVAL; >> - aa_audit_msg(AUDIT_APPARMOR_DENIED, &sa, NULL); >> - end_current_label_crit_section(aad(&sa)->label); >> ++ ad.info = "invalid"; >> + ad.error = error = -EINVAL; >> + aa_audit_msg(AUDIT_APPARMOR_DENIED, &ad, NULL); >> + end_current_label_crit_section(ad.subj_label); >> goto out; >> } >