Path: csiph.com!weretis.net!feeder4.news.weretis.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod From: Kees Cook Newsgroups: linux.kernel Subject: Re: [PATCH v1] module: Fully remove the kernel_module_from_file hook Date: Mon, 11 Jul 2016 20:50:02 +0200 Message-ID: References: X-Original-To: =?UTF-8?B?TWlja2HDq2wgU2FsYcO8bg==?= , James Morris Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=ccHpp2ToKzz0z5TvBxIiycDHAa8n4Sda59Wa7ZI/xkc=; b=W/L8HbFcR7q5im6Jdu4rxwc5bLpj7aGI6En30kpthNBvFZ6AWKg07xekViK00u21Mu ceVrRR2uza9lVxMzHLX8QV+wjKAiNwWkRhMUh+Ngew1OHP+cSt/zPGyWBx/OIx+Ug0pR zGSuzkGLUo+sR/lpfwtjfQ0KfJcRe683b5/wVQOXTAaE+5MxyP6K6I8Yn0N3cHZekiuo 7Nyva/RrvopWLGXIlGsnWrwsr9labXEr6kEMBizQ3+1AOBKMdM40ttsM4ei051pLwOhZ B8iTKbzqwZ58At7cRQqOpnlcLVPUSxfcu46dBLad2ludrdR9Yt2eDELoE+nMomZAJkWa KsOQ== Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=ccHpp2ToKzz0z5TvBxIiycDHAa8n4Sda59Wa7ZI/xkc=; b=lcz9jq9v7WBKE5V2HNYMtOarItW2GBQq27EsqwC8u08zv9bwvIMrMTtcrfUuqNFlxA J8tW33VYY/KdxBMlHlFnDTKBccik1CgTxPa0xeP3x3Wc4QGftmW1Ao2ihy9jMmszWqVb MxAHO7KG9sOozlcHTX1/QUbYcQ5iNi8x3KuvQ= X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-transfer-encoding; bh=ccHpp2ToKzz0z5TvBxIiycDHAa8n4Sda59Wa7ZI/xkc=; b=Rn+fD4dFewhoA4zX7T7YE5UIncAN14s7rA65vlaxXtFCmu5OZrcB0VBRaNX5KTLnHd e+QY6ADIBLYJQv1/mZ/tllsRF7p/abG9zSnvNT5PAZPsvvrenFZh+jR87BC6undBNQeo 5nyn3cfs1jmJ6LHeDIeyoOKYPxEBkaZPbBfaZXUoPnCuLbTbeWdqTORFSAozH0uucOGc 0zto5gHM6OL9W6JHmJj039xmS+zafEpWr5mTPlLMRtQBK4jRtTmHuaL/lh7JP+wTYokr CvSXI1UENe1WjkgB+yuuVpNdXzDbSeUSL9iebgcOZ2aySPqjFj9/KbONfVwVOPLrxjkl ZiHA== X-Gm-Message-State: ALyK8tK2Qqbu3noeNc53fL6CFOyxeU6Ee7SQXCttsH+HWXXfDraZa38rC+sQBeH334nWbRSXPxG4urWhm8oz6W/c X-Received: by 10.194.17.33 with SMTP id l1mr1054602wjd.7.1468262518568; Mon, 11 Jul 2016 11:41:58 -0700 (PDT) MIME-Version: 1.0 X-Google-Sender-Auth: FSFfLIdonO9W_0XruRJdVk0H68U Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 55 Organization: linux.* mail to news gateway X-Original-Cc: LKML , Mimi Zohar , "Luis R . Rodriguez" , Rusty Russell , Linus Torvalds , Greg Kroah-Hartman , "# 3.4.x" , linux-security-module X-Original-Date: Mon, 11 Jul 2016 14:41:57 -0400 X-Original-Message-ID: X-Original-References: <1468088355-18484-1-git-send-email-mic@digikod.net> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1440816 On Sat, Jul 9, 2016 at 2:19 PM, Mickaël Salaün wrote: > Fixes: a1db74209483 ("module: replace copy_module_from_fd with kernel version") Oh, hrm, was that still in there? Thanks for the catch! Acked-by: Kees Cook -Kees > > Signed-off-by: Mickaël Salaün > Cc: Mimi Zohar > Cc: Kees Cook > Cc: Luis R. Rodriguez > Cc: Rusty Russell > Cc: Linus Torvalds > Cc: Greg Kroah-Hartman > --- > include/linux/lsm_hooks.h | 1 - > include/linux/security.h | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h > index 7ae397669d8b..58c777ec8bcf 100644 > --- a/include/linux/lsm_hooks.h > +++ b/include/linux/lsm_hooks.h > @@ -1455,7 +1455,6 @@ union security_list_options { > int (*kernel_act_as)(struct cred *new, u32 secid); > int (*kernel_create_files_as)(struct cred *new, struct inode *inode); > int (*kernel_module_request)(char *kmod_name); > - int (*kernel_module_from_file)(struct file *file); > int (*kernel_read_file)(struct file *file, enum kernel_read_file_id id); > int (*kernel_post_read_file)(struct file *file, char *buf, loff_t size, > enum kernel_read_file_id id); > diff --git a/include/linux/security.h b/include/linux/security.h > index 14df373ff2ca..2b8c7d2a3fd8 100644 > --- a/include/linux/security.h > +++ b/include/linux/security.h > @@ -307,7 +307,6 @@ void security_transfer_creds(struct cred *new, const struct cred *old); > int security_kernel_act_as(struct cred *new, u32 secid); > int security_kernel_create_files_as(struct cred *new, struct inode *inode); > int security_kernel_module_request(char *kmod_name); > -int security_kernel_module_from_file(struct file *file); > int security_kernel_read_file(struct file *file, enum kernel_read_file_id id); > int security_kernel_post_read_file(struct file *file, char *buf, loff_t size, > enum kernel_read_file_id id); > -- > 2.8.1 > -- Kees Cook Chrome OS & Brillo Security