From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1764719AbYEATT5@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1764719AbYEATT5 (ORCPT <rfc822;w@1wt.eu>);
	Thu, 1 May 2008 15:19:57 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761449AbYEATTs
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 1 May 2008 15:19:48 -0400
Received: from agminet01.oracle.com ([141.146.126.228]:30829 "EHLO
	agminet01.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1758239AbYEATTr (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 1 May 2008 15:19:47 -0400
From: Chris Mason <chris.mason@oracle.com>
To: Tim Gardner <tim.gardner@canonical.com>
Subject: Re: Btrfs v0.14 Released
Date: Thu, 1 May 2008 15:17:55 -0400
User-Agent: KMail/1.9.6 (enterprise 0.20070907.709405)
Cc: jeffschroeder@computer.org, linux-fsdevel@vger.kernel.org,
       kernel-team@lists.ubuntu.com, linux-kernel@vger.kernel.org,
       linux-btrfs@vger.kernel.org
References: <200804291601.32945.chris.mason@oracle.com> <c24352ca0805010939q31f743aev17cc7f98d2ad0c71@mail.gmail.com> <481A14BA.9090305@canonical.com>
In-Reply-To: <481A14BA.9090305@canonical.com>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200805011517.55698.chris.mason@oracle.com>
X-Brightmail-Tracker: AAAAAQAAAAI=
X-Brightmail-Tracker: AAAAAQAAAAI=
X-Whitelist: TRUE
X-Whitelist: TRUE
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thursday 01 May 2008, Tim Gardner wrote:

[ btrfs oops on ubuntu ]

> >>  This is because ubuntu kernels ship with apparmor, you'll need this
> >> patch:
> >>
> >>  If there is a #ifdef IM_A_UBUNTU_KERNEL I can use, I'll do it.  Jeff
> >> Mahoney has a similar patch for SUSE that I've been meaning to merge,
> >> but I wanted to lookup some way to check for ubuntu as well.
> >>
> >>  -chris
> >>
> >>  diff -r e7da2489b19b file.c
> >>  --- a/file.c    Wed Apr 30 13:59:35 2008 -0400
> >>  +++ b/file.c    Thu May 01 12:25:11 2008 -0400
> >>  @@ -852,7 +852,7 @@ static ssize_t btrfs_file_write(struct f
> >>                 goto out_nolock;
> >>         if (count == 0)
> >>                 goto out_nolock;
> >>  -       err = remove_suid(fdentry(file));
> >>  +       err = remove_suid(&file->f_path);
> >>         if (err)
> >>                 goto out_nolock;
> >>         file_update_time(file);
>
> Couldn't you #ifdef based on CONFIG_SECURITY_APPARMOR ? This ought to
> work for Hardy. However the next development kernel (Intrepid) does not
> have the APPARMOR patches, so just knowing that its an UBUNTU kernel is
> not specific enough.

I've been assuming the apparmor patches change remove_suid even when they are 
not enabled in the config.

-chris