Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752286AbbKZDpz (ORCPT ); Wed, 25 Nov 2015 22:45:55 -0500 Received: from tundra.namei.org ([65.99.196.166]:37242 "EHLO namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751738AbbKZDpv (ORCPT ); Wed, 25 Nov 2015 22:45:51 -0500 Date: Thu, 26 Nov 2015 14:45:49 +1100 (AEDT) From: James Morris To: Linus Torvalds cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] security: updated fixes for 4.4 In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (LRH 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1354 Lines: 34 Please pull this updated set, which now includes a fix for SELinux policy processing (regression introduced by fa1aa143ac4a), as well as the previously posted fix for the user-triggerable oops in the Keys code. --- The following changes since commit 6ffeba9607343f15303a399bc402a538800d89d9: Merge tag 'dm-4.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm (2015-11-24 12:53:11 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus2 David Howells (1): KEYS: Fix handling of stored error in a negatively instantiated user key James Morris (1): Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2 Stephen Smalley (1): selinux: fix bug in conditional rules handling security/keys/encrypted-keys/encrypted.c | 2 ++ security/keys/trusted.c | 5 ++++- security/keys/user_defined.c | 5 ++++- security/selinux/ss/conditional.c | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/