From patchwork Fri Oct 2 17:38:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 11814229 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1F6276CB for ; Fri, 2 Oct 2020 17:38:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0353920758 for ; Fri, 2 Oct 2020 17:38:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Mfumh5tR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388434AbgJBRip (ORCPT ); Fri, 2 Oct 2020 13:38:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388406AbgJBRio (ORCPT ); Fri, 2 Oct 2020 13:38:44 -0400 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5500AC0613BB for ; Fri, 2 Oct 2020 10:38:42 -0700 (PDT) Received: by mail-pf1-x441.google.com with SMTP id x22so1729394pfo.12 for ; Fri, 02 Oct 2020 10:38:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NRNkvGI2Ff9BjWU3dffE18oblDO1Opoo7ReByCIGKwI=; b=Mfumh5tRxy4skOQP6OGVehMnWKDcGfbBGXiWQ720eRb5OVAh6dC5RBijHQgpZPj/Y4 YQXKfqFXUF679RfBa37dgjcpUP7MkM6k3757Sg6ZOw3gczyWHedDnJ9IiYxY6rw+0L2I WiL4xchzU3Ld30sxaoGGExLRw2vgpeVSEkQCU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NRNkvGI2Ff9BjWU3dffE18oblDO1Opoo7ReByCIGKwI=; b=gceyVNPKwtDwHCUVpq+1rNACqoFFpkdhzRjaXme/WME2DqUVf1lERXLOs35VcLN9WS BDEy+6rSCwY3EV43KMw+xLK0j58Rpu49H0+ZiUF5nVTXTDtJ7XF1l2kT15yFz2jTHojp sSMVrFCSRRwUgR2OfgMbiIwIKfgiJr39UrtvsCXy6+yIabBmaM+XS9PHH4rAVGm3YJMS 29lneSQEZmwaVQHp/QQYelqSvRU0lu8TX6KQKdwoM0NCzpLE3feVvGAhLl4IvdqJUX7+ amivnuLE6BNBtyl9ee0nP/CGMvnzvWrfTzTxqR0LZcRo7Vpi4xIhN4nyixCv7OA/juUc LrdQ== X-Gm-Message-State: AOAM5314oFTP7vi2R59mX7MtM7dDjpLx8vv+6fMmZ0bTBm5aFtMogEfB LEEpcYH+Xty65A6FxuA8Aw+8bg== X-Google-Smtp-Source: ABdhPJwwS7Nbs517CZEc++bRCN5UnGB0D5kqLBspE9m/jC8b6k7oNPzx/9EjCuSoJzqxzl4G5yJT6A== X-Received: by 2002:a63:c547:: with SMTP id g7mr3156527pgd.234.1601660321870; Fri, 02 Oct 2020 10:38:41 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id g1sm2650900pfm.124.2020.10.02.10.38.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 10:38:36 -0700 (PDT) From: Kees Cook To: Greg Kroah-Hartman Cc: Kees Cook , KP Singh , Jessica Yu , Scott Branden , Mimi Zohar , Luis Chamberlain , Takashi Iwai , SeongJae Park , KP Singh , linux-efi@vger.kernel.org, linux-security-module@vger.kernel.org, linux-integrity@vger.kernel.org, selinux@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 10/16] module: Call security_kernel_post_load_data() Date: Fri, 2 Oct 2020 10:38:22 -0700 Message-Id: <20201002173828.2099543-11-keescook@chromium.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201002173828.2099543-1-keescook@chromium.org> References: <20201002173828.2099543-1-keescook@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: Now that there is an API for checking loaded contents for modules loaded without a file, call into the LSM hooks. Signed-off-by: Kees Cook Reviewed-by: KP Singh Acked-by: Jessica Yu Reviewed-by: James Morris --- kernel/module.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index f47209e0fde6..adfa21dd3842 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3014,7 +3014,7 @@ static int copy_module_from_user(const void __user *umod, unsigned long len, if (info->len < sizeof(*(info->hdr))) return -ENOEXEC; - err = security_kernel_load_data(LOADING_MODULE, false); + err = security_kernel_load_data(LOADING_MODULE, true); if (err) return err; @@ -3024,11 +3024,17 @@ static int copy_module_from_user(const void __user *umod, unsigned long len, return -ENOMEM; if (copy_chunked_from_user(info->hdr, umod, info->len) != 0) { - vfree(info->hdr); - return -EFAULT; + err = -EFAULT; + goto out; } - return 0; + err = security_kernel_post_load_data((char *)info->hdr, info->len, + LOADING_MODULE, "init_module"); +out: + if (err) + vfree(info->hdr); + + return err; } static void free_copy(struct load_info *info)