Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Minjie Du <duminjie@vivo.com>
To:     John Johansen <john.johansen@canonical.com>,
        Paul Moore <paul@paul-moore.com>,
        James Morris <jmorris@namei.org>,
        "Serge E. Hallyn" <serge@hallyn.com>,
        Nick Terrell <terrelln@fb.com>,
        apparmor@lists.ubuntu.com (moderated list:APPARMOR SECURITY MODULE),
        linux-security-module@vger.kernel.org (open list:SECURITY SUBSYSTEM),
        linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com, Minjie Du <duminjie@vivo.com>
Subject: [PATCH v1] security: remove duplicate logical judgments in return
Date:   Tue,  4 Jul 2023 16:56:52 +0800
Message-Id: <20230704085653.6443-1-duminjie@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lPw3P8W5b0cEfX5JGVOyhklwi2JZyWZf2y2vRQCPTOAlZJzkwCepPlN7bCz8?=
 =?us-ascii?Q?SfHM6TbHn/TVvencelG3+Dsk+LHr3UYa27ODaNIyODhZu26FYPZ8mm5KFHKZ?=
 =?us-ascii?Q?bVPDT0Y9+Wr5b8FwhRbMOdBB8VBquTopj6C6guPL5jwzyp5gtxvV6kSqM/RW?=
 =?us-ascii?Q?czEjed0AMFBVJuw416jSP5yjqKAE+uCOj8r0+xzNGGtzzmv8gKxJAFyp3KJt?=
 =?us-ascii?Q?c+L6CbEmaJ6ppGwq1xpgzvedUm0BtQbQEqtv+nCMaTmLWVuZrubZeKDZfWDm?=
 =?us-ascii?Q?MUktuPQ4qk8lbHHWs0zzrxebyJhNQgXJyhntxtyCNGjuTi9G4M5BdIsG8MCI?=
 =?us-ascii?Q?ghtsO2ThDEejiVnhnZyZF47C4bvEaHusCmg0TrxLFlwrzKZf5PwVpHSQ3nzM?=
 =?us-ascii?Q?iVFOO7hfyqxmwE4xyLGq0o3AG5Xv454CcXDJjouU6z36hYBlnleH+BTjveAc?=
 =?us-ascii?Q?y+DbbyeoapNwEYrx/rYmM7gzd/hheeKug6b+sGFFyGDIWi5irpeLZp6QT7Mr?=
 =?us-ascii?Q?+e4mFbqxNHEfzilu1Z0K5YGDXB5n6l5HvKDPuEY5l5GF6K2UPpiwh4S4JSEI?=
 =?us-ascii?Q?pQZ+OGmwP2xsDGIogsz6WeZvQxAbDaDwD+apsvhQuVN6NdWMEcidT9y4vNR6?=
 =?us-ascii?Q?hfFyxJ4PAn60b7yQHiytGqU5IjV9ZnOZ7yEyhI59dgfqkfZmg3RFKXWFQaEq?=
 =?us-ascii?Q?H6hXyHhvA2kC2RDRFwJVnk3zHzgHwpWOJ+XFE0U5SR9/syav3VmRp3zQe+5o?=
 =?us-ascii?Q?H0Ul+El92Ee2b64hOboS4e4SM1fWyYNZKpi4LkWeVpupGgt4Iup4h9wgKOsr?=
 =?us-ascii?Q?ZF0SiqVvUXfHBFDwVMqEOpr+iyBGgOjYOq/4UfWJZyOvnmGdm3vA50RPBgzX?=
 =?us-ascii?Q?/+3xe+w3AnREZooFyO6evcpZJM0Du56gyq1NZMF1R4fGLvmGnhfDW2LR/fiG?=
 =?us-ascii?Q?PxpZnnuX1h55qZnorhWARMP931YIJByrRmND2VrINTCIyVeHnnZOGcusXZrD?=
 =?us-ascii?Q?4fyxTfwxfcREBWZ1VuZSCNq9UX89hgLke1X+YhgyJ0vxRyNUMLDl/Xe51DDY?=
 =?us-ascii?Q?QHpDz/FaX8xNSyVrhQzyhZq3A7yqtI1bcFbyKeW00Ww+54WUpxFlm1QNC62B?=
 =?us-ascii?Q?VCwfRzYFEsSPMqAjj/NTILRMuAj0d+KDIlGQxCb6Gnp1DCF4891fKByx+vzv?=
 =?us-ascii?Q?+2l/TOF33vQFl3rk3bLCLWnNp4sPdy8VSxNUBSYMEgZ6sE1gGs1eMlqSmhD1?=
 =?us-ascii?Q?I4I1jVZeXUEsuVP+BScWs4M6HkFEteSJ1y5pbb9vH6dQpGm2NnpMZY5C/xz7?=
 =?us-ascii?Q?MWCh7+++9nudqwCIruulX0+EjiLmYUk8uW4kUJJvxW25JKKTeYq92zxL7lOA?=
 =?us-ascii?Q?vGC+XiH737EInscV+XLAA7x66EDGICZvVKvnQO6pMEpWnY+cVCpVBJlmoHkP?=
 =?us-ascii?Q?HVDPqjB2SowGis8tTL2aNHweVo18/09me8aeKKd7s5Q1DR6aWQAPTsrlgvZg?=
 =?us-ascii?Q?9Xp4+Oo8v4nLcyzpkd7OI30D+VS1yejKBFCqkGCZkC/XhZy0nWjo1/EbRzTd?=
 =?us-ascii?Q?kGzWJozP6KqYXxkc6fEOSQL0yKSqTDxe2s/+X2JN?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 22f29be2-58d9-4417-89f4-08db7c6ca33e
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB5288.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2023 08:57:04.2521
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: gy7Yzvx3acGXjV+7qcWAYyCof9JUM2x371XbejwM92+fR+u8BGpPP4rF7KZRUpfB4ZW7TwUNcb3SwGC4wW/cPg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB5659
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Fix: delate duplicate logical judgments:
aa_unpack_u32(e, &perm->allow, NULL);
Please check this. Thank you!

Signed-off-by: Minjie Du <duminjie@vivo.com>
---
 security/apparmor/policy_unpack.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index 694fb7a09..2069adf0a 100644
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -646,7 +646,6 @@ static bool unpack_perm(struct aa_ext *e, u32 version, struct aa_perms *perm)
 		return false;
 
 	return	aa_unpack_u32(e, &perm->allow, NULL) &&
-		aa_unpack_u32(e, &perm->allow, NULL) &&
 		aa_unpack_u32(e, &perm->deny, NULL) &&
 		aa_unpack_u32(e, &perm->subtree, NULL) &&
 		aa_unpack_u32(e, &perm->cond, NULL) &&
-- 
2.39.0