| Message ID | 20220926114838.1699096-1-cuigaosheng1@huawei.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | apparmor: fix obsoleted comments for aa_getprocattr() and audit_resource() | expand |
On 9/26/22 04:48, Gaosheng Cui wrote: > Update the comments for aa_getprocattr() and audit_resource(), the > args of them have beed changed since commit 76a1d263aba3 ("apparmor: > switch getprocattr to using label_print fns()"). > > Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> Acked-by: John Johansen <john.johansen@canonical.com> I have pulled this into my tree > --- > security/apparmor/procattr.c | 11 +++++------ > security/apparmor/resource.c | 2 ++ > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/security/apparmor/procattr.c b/security/apparmor/procattr.c > index 86ad26ef72ed..197d41f9c32b 100644 > --- a/security/apparmor/procattr.c > +++ b/security/apparmor/procattr.c > @@ -17,14 +17,13 @@ > > > /** > - * aa_getprocattr - Return the profile information for @profile > - * @profile: the profile to print profile info about (NOT NULL) > - * @string: Returns - string containing the profile info (NOT NULL) > + * aa_getprocattr - Return the label information for @label > + * @label: the label to print label info about (NOT NULL) > + * @string: Returns - string containing the label info (NOT NULL) > * > - * Requires: profile != NULL > + * Requires: label != NULL && string != NULL > * > - * Creates a string containing the namespace_name://profile_name for > - * @profile. > + * Creates a string containing the label information for @label. > * > * Returns: size of string placed in @string else error code on failure > */ > diff --git a/security/apparmor/resource.c b/security/apparmor/resource.c > index 1ae4874251a9..4c1869bb31ec 100644 > --- a/security/apparmor/resource.c > +++ b/security/apparmor/resource.c > @@ -45,6 +45,8 @@ static void audit_cb(struct audit_buffer *ab, void *va) > * @profile: profile being enforced (NOT NULL) > * @resource: rlimit being auditing > * @value: value being set > + * @peer: aa_albel of the task being set > + * @info: info being auditing > * @error: error value > * > * Returns: 0 or sa->error else other error code on failure
diff --git a/security/apparmor/procattr.c b/security/apparmor/procattr.c index 86ad26ef72ed..197d41f9c32b 100644 --- a/security/apparmor/procattr.c +++ b/security/apparmor/procattr.c @@ -17,14 +17,13 @@ /** - * aa_getprocattr - Return the profile information for @profile - * @profile: the profile to print profile info about (NOT NULL) - * @string: Returns - string containing the profile info (NOT NULL) + * aa_getprocattr - Return the label information for @label + * @label: the label to print label info about (NOT NULL) + * @string: Returns - string containing the label info (NOT NULL) * - * Requires: profile != NULL + * Requires: label != NULL && string != NULL * - * Creates a string containing the namespace_name://profile_name for - * @profile. + * Creates a string containing the label information for @label. * * Returns: size of string placed in @string else error code on failure */ diff --git a/security/apparmor/resource.c b/security/apparmor/resource.c index 1ae4874251a9..4c1869bb31ec 100644 --- a/security/apparmor/resource.c +++ b/security/apparmor/resource.c @@ -45,6 +45,8 @@ static void audit_cb(struct audit_buffer *ab, void *va) * @profile: profile being enforced (NOT NULL) * @resource: rlimit being auditing * @value: value being set + * @peer: aa_albel of the task being set + * @info: info being auditing * @error: error value * * Returns: 0 or sa->error else other error code on failure
Update the comments for aa_getprocattr() and audit_resource(), the args of them have beed changed since commit 76a1d263aba3 ("apparmor: switch getprocattr to using label_print fns()"). Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> --- security/apparmor/procattr.c | 11 +++++------ security/apparmor/resource.c | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-)