mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: John Johansen <john.johansen@canonical.com>
Cc: James Morris <jmorris@namei.org>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Rusty Russell <rusty@rustcorp.com.au>
Subject: Re: linux-next: Fix AppArmor build warnings after merge of the security-testing tree
Date: Wed, 18 Aug 2010 10:56:09 +1000	[thread overview]
Message-ID: <20100818105609.642a5e61.sfr@canb.auug.org.au> (raw)
In-Reply-To: <4C57819F.4000405@canonical.com>

[-- Attachment #1: Type: text/plain, Size: 1327 bytes --]

Hi all,

On Mon, 02 Aug 2010 19:40:31 -0700 John Johansen <john.johansen@canonical.com> wrote:
>
> the follow patch fixes the AppArmor build warnings from the security-next tree merge

Thanks.

> From: John Johansen <john.johansen@canonical.com>
> Date: Mon, 2 Aug 2010 19:31:57 -0700
> Subject: [PATCH] AppArmor: Fix build warnings from linux-next merge
> 
> Patch AppArmor to fix build warnings for changes that exist in the
> linux-next tree.
> 
> Signed-off-by: John Johansen <john.johansen@canonical.com>
	.
	.
> diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
> index d5666d3..f56978a 100644
> --- a/security/apparmor/lsm.c
> +++ b/security/apparmor/lsm.c
> @@ -607,9 +607,11 @@ static int apparmor_setprocattr(struct task_struct *task, char *name,
>  	return error;
>  }
>  
> -static int apparmor_task_setrlimit(unsigned int resource,
> +static int apparmor_task_setrlimit(struct task_struct *tsk,
> +				   unsigned int resource,
>  				   struct rlimit *new_rlim)
>  {
> +	/* Use current profile instead of profile on @tsk */
>  	struct aa_profile *profile = aa_current_profile();
>  	int error = 0;

This last change seems to have been lost along the way.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

  reply	other threads:[~2010-08-18  0:56 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-02  2:16 linux-next: build failure " Stephen Rothwell
2010-08-03  0:04 ` John Johansen
2010-08-05  1:37   ` Stephen Rothwell
2010-08-03  2:40 ` linux-next: Fix AppArmor build warnings " John Johansen
2010-08-18  0:56   ` Stephen Rothwell [this message]
2010-08-18  1:00     ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100818105609.642a5e61.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=jmorris@namei.org \
    --cc=john.johansen@canonical.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rusty@rustcorp.com.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®