From patchwork Thu Aug 23 13:42:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 10574077 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F266B139B for ; Thu, 23 Aug 2018 14:08:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8A642C17D for ; Thu, 23 Aug 2018 14:08:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC8DB2C180; Thu, 23 Aug 2018 14:08:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.4 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAEC22C17D for ; Thu, 23 Aug 2018 14:08:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730052AbeHWRig (ORCPT ); Thu, 23 Aug 2018 13:38:36 -0400 Received: from gateway20.websitewelcome.com ([192.185.66.3]:41383 "EHLO gateway20.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729499AbeHWRig (ORCPT ); Thu, 23 Aug 2018 13:38:36 -0400 X-Greylist: delayed 1495 seconds by postgrey-1.27 at vger.kernel.org; Thu, 23 Aug 2018 13:38:35 EDT Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway20.websitewelcome.com (Postfix) with ESMTP id 0B43C4014DCB1 for ; Thu, 23 Aug 2018 08:43:54 -0500 (CDT) Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with SMTP id spt4fPdKZPvAdsptbfO5Rm; Thu, 23 Aug 2018 08:43:53 -0500 X-Authority-Reason: nr=8 Received: from [189.250.40.214] (port=58782 helo=embeddedor) by gator4166.hostgator.com with esmtpa (Exim 4.91) (envelope-from ) id 1fspt2-000Z5p-Rm; Thu, 23 Aug 2018 08:42:56 -0500 Date: Thu, 23 Aug 2018 08:42:55 -0500 From: "Gustavo A. R. Silva" To: John Johansen , James Morris , "Serge E. Hallyn" Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH] apparmor: remove dead code Message-ID: <20180823134255.GA12128@embeddedor.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.250.40.214 X-Source-L: No X-Exim-ID: 1fspt2-000Z5p-Rm X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedor) [189.250.40.214]:58782 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 4 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Due to commit fb5841091f28 ("apparmor: remove no-op permission check in policy_unpack"), there is some leftover code. Coverity reports this issue as Structurally dead code. Fix this by removing such code. Addresses-Coverity-ID: 1472998 ("Structurally dead code") Fixes: fb5841091f28 ("apparmor: remove no-op permission check in policy_unpack") Signed-off-by: Gustavo A. R. Silva --- security/apparmor/policy_unpack.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index 3647b58..21cb384 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c @@ -422,10 +422,6 @@ static struct aa_dfa *unpack_dfa(struct aa_ext *e) } return dfa; - -fail: - aa_put_dfa(dfa); - return ERR_PTR(-EPROTO); } /**