From patchwork Thu Jul 26 10:33:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 173398 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id C82ED2C0086 for ; Thu, 26 Jul 2012 20:33:46 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SuLNu-0001Pd-VM; Thu, 26 Jul 2012 10:33:35 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SuLNs-0001PY-Mk for kernel-team@lists.ubuntu.com; Thu, 26 Jul 2012 10:33:32 +0000 Received: from 79-78-215-204.dynamic.dsl.as9105.com ([79.78.215.204] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SuLNs-0007jK-DC for kernel-team@lists.ubuntu.com; Thu, 26 Jul 2012 10:33:32 +0000 Date: Thu, 26 Jul 2012 11:33:30 +0100 From: Andy Whitcroft To: Ubuntu Kernel Team Subject: natty/ti-omap4 CVE catchup Message-ID: <20120726103330.GL2491@dm> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com I was looking at the CVE matrix today and noted that there were CVEs applied to natty/master but not to natty/ti-omap4; this branch is not a rebase branch and so needs manual handling. I have prepared a branch with the requisite commits cherry-picked from natty/master and marked those which are not applicable to ARM not-affected in the tracker. Pull request is below. Note that there are a couple of additional NFS fixes included to allow application of the CVE, all are stable fixes and all are cherry-picked from the natty/master branch. Proposing for natty/ti-omap4. -apw The following changes since commit 0851ca6dcfe069065835822d56862905813563cf: UBUNTU: Ubuntu-2.6.38-1209.24 (2012-04-30 11:42:58 +0200) are available in the git repository at: git://kernel.ubuntu.com/apw/ubuntu-natty.git cve-catchup for you to fetch changes up to 5266d78beb2c985ca170855c5fc9e61187b09e70: Fix length of buffer copied in __nfs4_get_acl_uncached (2012-07-26 11:09:11 +0100) ---------------------------------------------------------------- Andy Adamson (1): NFSv4: include bitmap in nfsv4 get acl data Brad Figg (1): Avoid reading past buffer when calling GETACL Eric Paris (1): fcaps: clear the same personality flags as suid when fcaps are used Greg Kroah-Hartman (1): hfsplus: Fix potential buffer overflows Jason Wang (1): net: sock: validate data_len before allocating skb in sock_alloc_send_pskb() Jeff Layton (1): nfs: don't lose MS_SYNCHRONOUS on remount of noac mount Jeff Mahoney (1): dl2k: Clean up rio_ioctl Sachin Prabhu (2): Avoid beyond bounds copy while caching ACL Fix length of buffer copied in __nfs4_get_acl_uncached Steve Conklin (1): natty security: fix compile error in commoncap.c Trond Myklebust (3): NFSv4.1: Ensure state manager thread dies on last umount NFSv4: Handle expired stateids when the lease is still valid NFSv4.1: Fix the handling of NFS4ERR_SEQ_MISORDERED errors drivers/net/dl2k.c | 53 ++++----------------- drivers/net/dl2k.h | 7 --- fs/hfsplus/catalog.c | 4 ++ fs/hfsplus/dir.c | 11 +++++ fs/nfs/nfs4proc.c | 112 +++++++++++++++++++++++++++----------------- fs/nfs/nfs4state.c | 10 ++-- fs/nfs/nfs4xdr.c | 43 ++++++++++++----- fs/nfs/super.c | 9 ++++ include/linux/nfs_xdr.h | 5 ++ include/linux/sunrpc/xdr.h | 2 + net/core/sock.c | 7 ++- net/sunrpc/xdr.c | 3 +- security/commoncap.c | 6 +++ 13 files changed, 160 insertions(+), 112 deletions(-)