lkml.org 
[lkml]   [2010]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: linux-next: Fix AppArmor build warnings after merge of the security-testing tree
    Hi Stephen,

    the follow patch fixes the AppArmor build warnings from the security-next tree merge


    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>
    ---
    security/apparmor/domain.c | 2 +-
    security/apparmor/ipc.c | 2 +-
    security/apparmor/lsm.c | 4 +++-
    3 files changed, 5 insertions(+), 3 deletions(-)

    diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
    index 08bbe63..c825c6e 100644
    --- a/security/apparmor/domain.c
    +++ b/security/apparmor/domain.c
    @@ -62,7 +62,7 @@ static int may_change_ptraced_domain(struct task_struct *task,
    struct aa_profile *to_profile)
    {
    struct task_struct *tracer;
    - struct cred *cred = NULL;
    + const struct cred *cred = NULL;
    struct aa_profile *tracerp = NULL;
    int error = 0;

    diff --git a/security/apparmor/ipc.c b/security/apparmor/ipc.c
    index 9013a78..649fad8 100644
    --- a/security/apparmor/ipc.c
    +++ b/security/apparmor/ipc.c
    @@ -100,7 +100,7 @@ int aa_ptrace(struct task_struct *tracer, struct task_struct *tracee,

    if (!unconfined(tracer_p)) {
    /* lcred released below */
    - struct cred *lcred = get_task_cred(tracee);
    + const struct cred *lcred = get_task_cred(tracee);
    struct aa_profile *tracee_p = aa_cred_profile(lcred);

    error = aa_may_ptrace(tracer, tracer_p, tracee_p, mode);
    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;

    --
    1.7.0.4


    \
     
     \ /
      Last update: 2010-08-03 04:43    [W:0.025 / U:239.652 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site