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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E65ACC46CD2 for ; Sat, 27 Jan 2024 05:17:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3EABE6B007B; Sat, 27 Jan 2024 00:17:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3738C6B007D; Sat, 27 Jan 2024 00:17:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C60A6B007E; Sat, 27 Jan 2024 00:17:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 097476B007B for ; Sat, 27 Jan 2024 00:17:32 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 82FA41201EB for ; Sat, 27 Jan 2024 05:17:31 +0000 (UTC) X-FDA: 81723933102.07.3D5B7D3 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by imf14.hostedemail.com (Postfix) with ESMTP id 731AF10000E for ; Sat, 27 Jan 2024 05:17:29 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=canonical.com header.s=20210705 header.b=HAHvAryw; dmarc=pass (policy=none) header.from=canonical.com; spf=pass (imf14.hostedemail.com: domain of john.johansen@canonical.com designates 185.125.188.121 as permitted sender) smtp.mailfrom=john.johansen@canonical.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706332649; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=RGdmLwVJaeGh5hPc5pI57XxhUQN2/0dpo4aenb9lXl4=; b=eH1Bbp0OWRpqkjAXn2YgXbzMhqBiETJ7EGHQXm7UlKGiPkheNtrezWBvYN1W3ayZWFnqwP r/0/0yecdReTep24ugBWHfVhK4MBR7e/5u9RyZe4dhnl3SiwzgTDMnck9dHH3Sta2hGg8q YB3OQtxtGjsTU5laFblzrx5ElTMjBuo= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=canonical.com header.s=20210705 header.b=HAHvAryw; dmarc=pass (policy=none) header.from=canonical.com; spf=pass (imf14.hostedemail.com: domain of john.johansen@canonical.com designates 185.125.188.121 as permitted sender) smtp.mailfrom=john.johansen@canonical.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706332649; a=rsa-sha256; cv=none; b=fdb7c/qFuWZKYJgdzCU8WV5U5ecOdcBhAqSlVVlKd0x7WDHF4Z9NoRMKJU2JuQiaLw/O1e PE+0Ly/GQ8EHyGzcxud7Mi6eAeLuJ7BuLEwM6q2dkIuT2JGDLyrTAk9eni1245u1ANLoRi 7ZTn6FS4QT5qMss2/S1oigbC5OQXH7Y= Received: from [192.168.192.85] (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-1.canonical.com (Postfix) with ESMTPSA id BC6573FFCB; Sat, 27 Jan 2024 05:17:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1706332647; bh=RGdmLwVJaeGh5hPc5pI57XxhUQN2/0dpo4aenb9lXl4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=HAHvArywcoUyZ+eBuafvECo7LZ4BCBvkD/ANxor/PnWy6F0HVR1EGQ5lhiaFKUCM2 ZqNYkQv3UThEoEUFpvnKFjlmD/5+pbB1x+iTN+huq2UE6gl8Qz3O2bXfm6/SBx0tlC VM6g1SktDlIAVy+JuOYo3y/WYOdAHe/3JNSLiKD51n9QDVpYI34isEqAWFU0CCpMel XEKIYzVpNmhKoSpLNN4sgO/YfXqvxWzC3MDM8sWxTem82PrnT7BaVMu7UqyTz3wUEI D/PxZZaSYoCHs6Q0ZK5xhDh1BatUaVH1K4i9RA7m4QCo8zDxYGaI3AAulRFlExbObG 2qkwYTw8h06+g== Message-ID: Date: Fri, 26 Jan 2024 21:17:22 -0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [6.8-rc1 Regression] Unable to exec apparmor_parser from virt-aa-helper Content-Language: en-US To: Kees Cook , Linus Torvalds Cc: Kevin Locke , Kentaro Takeda , Tetsuo Handa , Josh Triplett , Mateusz Guzik , Al Viro , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org References: <202401240832.02940B1A@keescook> <202401240958.8D9A11E8E@keescook> From: John Johansen Autocrypt: addr=john.johansen@canonical.com; keydata= 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 lT9Q Organization: Canonical In-Reply-To: <202401240958.8D9A11E8E@keescook> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 731AF10000E X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 7x1zewo6yrd18admgrkqxxfmhc3ybu5e X-HE-Tag: 1706332649-11835 X-HE-Meta: U2FsdGVkX1+x0SZcnDQ7Z2hSPrecD4i3AFZ6F0EDEG0IxuRaY+SFUyjHqHxIihZ47nituAG89BroM2bxF5GGLbv5fYC3GMNGStp4yqAlnPhbEITNB429cBNjVNydkYwZOd4W6nnlwo7DhM6rVKBnXZshN0gNUvlQrpgzR8ghGhb0qnc8EqQvsVtcBUKjawrjjxs71P6CH3sXCD8TDLTQBU5UL12+ffo5MpoSQIFD0f+NgRztXHc2ch+T/gM9RS6K3xca+6euOVhVlE+AavdrfGNKbqcRyWr48oiRDa9BjHei90WxSqo88R8Jlh3CD3+CSyVaJajNtF3nQifFbHVV7HC9PQVtuS1j/3qFeN8Lwb6Zal/+yyaO02POBnq2XOy63Wskm4VvWekQXZotWtBLjuYZYOCvLju/VjjE++ZjYqGMwioA+zbXdR9WTeBiGzPNHbWxqB+mx4Ga6s2sjvlvfchkdQHrrKGJXZPXr6hVk4NADnJ7eipRRJqnme2EaKW9sabTsqGOQYY6GIaz2zRvTbb+rLS6PI53W8EdtnX/mkIMijKg+A4sKSYdykYGatfFFP2by7BZLrFLDwb4gSxrkV/o5IaglYGh2WK0Ms1ZGqVF1WY7WiJHGaP3wzF8Zmeqh5/DVM/1nDX3nguD1dlk9cExDn5BRlQYnciPG4E5+ZBAcAyFMKn5l+8JA6z12fgvgQhR7RYetaGWecJFEqc/ukhu/HEc6BAox/wfWup+G26lrxk7lTZC7D3+pLKZB71otlHCJkLGB4Xd2u5rvv/d9B6RcGAo58MzgkMUIu6D9Rul1Qqrk7GCLxdao6ajMWKei35vuma58TJIrjfk5em4mtZA+iZIuBoMfBg6+1mXx6KPOpEA/u6sVEs40G2kRHYgCtqG+69qsHkCDATIOpuBHU+X8Jpcvb7OUZINE647yQDVBZg5R8/hlIVd7cYnYFFLSXfN7T4+U4Y5SP/xs89 PwPOB05o CBOYhZFrB5Bqb4BCvzDl98s1/kqZzSXSApbvkhQtOfbpPk3J6wAgFdnS3J3+PMGpZ9TDcCbz+2u9UymD0JHIQLVC06mTcopLgRYdwpXenLJQc87O4YHde6/BuawBdrRZ05uAZPPCrsU7NQZNYF/U0BbDGDXntwmWkXr5JEU6D66ykdJKtURY9qkAVZzjWwREoSdVwkxbyF6YMlAxZ8XGn/QdNDhw6nVqsg0zg2GRQYkKG8uCMxKJL2cigzddjFzSRX1irwq1TEsvs0j3Lb+giRYUjMEkN0pA6SxWkNAjRJKJ1dD+C2pu0TziDpnviM0D6aPAlXf8W8uzdvrhJifLHR8za42KC2g4FJlrUveYrJN+hrh/EtPdjcEbcxFM+r/9sRJhf X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 1/24/24 10:57, Kees Cook wrote: > On Wed, Jan 24, 2024 at 09:10:58AM -0800, Linus Torvalds wrote: >> On Wed, 24 Jan 2024 at 08:54, Linus Torvalds >> wrote: >>> >>> Hmm. That whole thing is disgusting. I think it should have checked >>> FMODE_EXEC, and I have no idea why it doesn't. >> >> Maybe because FMODE_EXEC gets set for uselib() calls too? I dunno. I >> think it would be even better if we had the 'intent' flags from >> 'struct open_flags' available, but they aren't there in the >> file_open() security chain. > > I've tested AppArmor, and this works fine: > thanks. I also ran it through the regression test suit, to double check so that Murphy doesn't bite. that this even tripped a regression is a bug that I am going to have to chase down. The file check at this point should just be redundant. thanks for the quick fix > diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c > index 7717354ce095..ab104ce05f96 100644 > --- a/security/apparmor/lsm.c > +++ b/security/apparmor/lsm.c > @@ -470,7 +470,7 @@ static int apparmor_file_open(struct file *file) > * implicit read and executable mmap which are required to > * actually execute the image. > */ > - if (current->in_execve) { > + if (file->f_flags & __FMODE_EXEC) { > fctx->allow = MAY_EXEC | MAY_READ | AA_EXEC_MMAP; > return 0; > } > > Converting TOMOYO is less obvious to me, though, as it has a helper that > isn't strictly always called during open(). I haven't finished figuring > out the call graphs for it... >