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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 126ECC76186 for ; Thu, 18 Jul 2019 03:03:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1B9621855 for ; Thu, 18 Jul 2019 03:03:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563419011; bh=XZdhTy0JEJZY3lK6Jn/I1noxcLUvIqAh9WQXu1Larbs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YsDGQBM/+UuoacQo+NJ/pkDp/BU09zZNnfzR/EwkpiqMuc2AxvQ3gXd/HacoePiri SJiXR49ur1KAgVM3bb/Czr4LJXtHHz11rU6mOeMEDmM894mcjFguFsN0TxMO2UldwK UYW7lJco6uMopJVAjzaE78yR3Z9haBJ4D+vkpe4k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389326AbfGRDD1 (ORCPT ); Wed, 17 Jul 2019 23:03:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:34104 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389318AbfGRDD0 (ORCPT ); Wed, 17 Jul 2019 23:03:26 -0400 Received: from localhost (115.42.148.210.bf.2iij.net [210.148.42.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D010721849; Thu, 18 Jul 2019 03:03:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563419006; bh=XZdhTy0JEJZY3lK6Jn/I1noxcLUvIqAh9WQXu1Larbs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nzoifOENBshaVXw5HuNO8fDSqPvcl+hTtd6DPS+WRrUOEDqCD6eSEnPaG3JhdUH7y 41g1GrXnN1iC7kMf8hdt3nl12kjayaU4z0rCDWwjiKPtsd4Vr2DVmBWxEC3WY/NzzC GDUIrqzzLRb3oQm3fLZchPJvMF9WN9kUwfZRSv7c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, Luis Chamberlain Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mimi Zohar , Kees Cook , "Rafael J. Wysocki" , Sven Van Asbroeck , Mimi Zohar Subject: [PATCH 5.2 06/21] firmware: improve LSM/IMA security behaviour Date: Thu, 18 Jul 2019 12:01:24 +0900 Message-Id: <20190718030031.805647808@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190718030030.456918453@linuxfoundation.org> References: <20190718030030.456918453@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sven Van Asbroeck commit 2472d64af2d3561954e2f05365a67692bb852f2a upstream. The firmware loader queries if LSM/IMA permits it to load firmware via the sysfs fallback. Unfortunately, the code does the opposite: it expressly permits sysfs fw loading if security_kernel_load_data( LOADING_FIRMWARE) returns -EACCES. This happens because a zero-on-success return value is cast to a bool that's true on success. Fix the return value handling so we get the correct behaviour. Fixes: 6e852651f28e ("firmware: add call to LSM hook before firmware sysfs fallback") Cc: Stable Cc: Mimi Zohar Cc: Kees Cook To: Luis Chamberlain Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: linux-kernel@vger.kernel.org Signed-off-by: Sven Van Asbroeck Reviewed-by: Mimi Zohar Signed-off-by: Greg Kroah-Hartman --- drivers/base/firmware_loader/fallback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/base/firmware_loader/fallback.c +++ b/drivers/base/firmware_loader/fallback.c @@ -659,7 +659,7 @@ static bool fw_run_sysfs_fallback(enum f /* Also permit LSMs and IMA to fail firmware sysfs fallback */ ret = security_kernel_load_data(LOADING_FIRMWARE); if (ret < 0) - return ret; + return false; return fw_force_sysfs_fallback(opt_flags); }