Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp2367708pxb; Fri, 8 Oct 2021 06:27:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXAZIOLrMlHY8ti6HvryjfKD7bAzDOobRtwbywFpNAnQGKS+0MPZlT4IZwLwwtvTW7TwjN X-Received: by 2002:a05:6a00:23d3:b0:44c:a67f:49af with SMTP id g19-20020a056a0023d300b0044ca67f49afmr10493414pfc.50.1633699653503; Fri, 08 Oct 2021 06:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633699653; cv=none; d=google.com; s=arc-20160816; b=0idVQl68dTo9ti8AybegwaFSTJRmpEmPiIRyGD+ODytS+m+8qcIGtOr0kUvBtZW34I x1kCB4R557xDlEoHhq2lzg6T2bnXGla5l+thQyTn4oMoTrL6muQHI+bU+oAZ4HCgHYtt xC8Z3wczUUun5cgVNWM5NV7ShROyKAmDWs+T7Dk/FacjF99CgFn2mirynPkSRlTCOWci xYV7HCsFU/7l7DmvufNfksYrZtEBKEnbmoTHwprEG3slCHoFf2e5fZ9YbVMl5zWft84t 6nBr/ADKZl6RbRzNq3XrkWi0cg5BA03K2uOI4mJWYQh4Qu9AE//lEh6yjmUAOu/cgT9C X2yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version:date :message-id:subject:references:in-reply-to:cc:to:from; bh=SUwUAtyKngFq7Wux3+Vb9gQhWRfpZKZdvt0tDk4mRkA=; b=yMa0XxV4MK0dzTtffAjuzZ2ti4ty5ExT0RtczuNrmHq3b0CgkSZp+/0Wd/cdWXZx3f PLpVUtihjtuyKy31p/NwG7LQTEDlRffKAiYQQKV7tz4Q4MENxpObfwW88+hks+1k9Pu5 uyB3Ux7KfBEv0P7DwC0+55aoVQpEslJstyp3at10q6P4tWjdeKbjRJiuZaCX0npVD0RB XDoTCiCnUAr1dXOYguZEwNHZTeKvPG2ftXKrThfi1FOaRZg02wzrIjmc5nuf1gCHZFUZ THN2Qq1kxeWYfZ9+vj9L4xbNo2Gom6hwVgRNGyAhcrHw1GGXn82LyBnxhZHQ311TbmlD fqkg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id nl18si11348936pjb.29.2021.10.08.06.27.19; Fri, 08 Oct 2021 06:27:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234337AbhJHN0c (ORCPT + 99 others); Fri, 8 Oct 2021 09:26:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230282AbhJHN0b (ORCPT ); Fri, 8 Oct 2021 09:26:31 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee2:21ea]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32E2EC061570 for ; Fri, 8 Oct 2021 06:24:36 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4HQpnT0cp5z4xbR; Sat, 9 Oct 2021 00:24:29 +1100 (AEDT) From: Michael Ellerman To: Paul Mackerras , Michael Ellerman , Christophe Leroy , Benjamin Herrenschmidt Cc: Finn Thain , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Stan Johnson In-Reply-To: <0d0c4d0f050a637052287c09ba521bad960a2790.1631715131.git.christophe.leroy@csgroup.eu> References: <0d0c4d0f050a637052287c09ba521bad960a2790.1631715131.git.christophe.leroy@csgroup.eu> Subject: Re: [PATCH] powerpc/32s: Fix kuap_kernel_restore() Message-Id: <163369938390.3568929.9026666512859787724.b4-ty@ellerman.id.au> Date: Sat, 09 Oct 2021 00:23:03 +1100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 15 Sep 2021 16:12:24 +0200, Christophe Leroy wrote: > At interrupt exit, kuap_kernel_restore() calls kuap_unclok() with the > value contained in regs->kuap. However, when regs->kuap contains > 0xffffffff it means that KUAP was not unlocked so calling > kuap_unlock() is unrelevant and results in jeopardising the contents > of kernel space segment registers. > > So check that regs->kuap doesn't contain KUAP_NONE before calling > kuap_unlock(). In the meantime it also means that if KUAP has not > been correcly locked back at interrupt exit, it must be locked > before continuing. This is done by checking the content of > current->thread.kuap which was returned by kuap_get_and_assert_locked() > > [...] Applied to powerpc/fixes. [1/1] powerpc/32s: Fix kuap_kernel_restore() https://git.kernel.org/powerpc/c/d93f9e23744b7bf11a98b2ddb091d129482ae179 cheers