Messages in this thread | | | Date | Wed, 18 Aug 2010 11:00:47 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: Fix AppArmor build warnings after merge of the security-testing tree |
| |
Hi again,
On Wed, 18 Aug 2010 10:56:09 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > On Mon, 02 Aug 2010 19:40:31 -0700 John Johansen <john.johansen@canonical.com> wrote: > > > > 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.
Sorry, my mistake, this change is sitting in the security-testing tree in linux-next still.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |