[PATCH] audit: removing unused variable

[PATCH] audit: removing unused variable

[Saurabh Sengar]

variavle rc in not required as it is just used for unchanged for return,
and return is always 0 in the function.

Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
---
 kernel/audit.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index 662c007..409482f 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -686,23 +686,22 @@ static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type)
 
 static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type)
 {
-	int rc = 0;
 	uid_t uid = from_kuid(&init_user_ns, current_uid());
 	pid_t pid = task_tgid_nr(current);
 
 	if (!audit_enabled && msg_type != AUDIT_USER_AVC) {
 		*ab = NULL;
-		return rc;
+		return 0;
 	}
 
 	*ab = audit_log_start(NULL, GFP_KERNEL, msg_type);
 	if (unlikely(!*ab))
-		return rc;
+		return 0;
 	audit_log_format(*ab, "pid=%d uid=%u", pid, uid);
 	audit_log_session_info(*ab);
 	audit_log_task_context(*ab);
 
-	return rc;
+	return 0;
 }
 
 int is_audit_feature_set(int i)
-- 
1.9.1

Re: [PATCH] audit: removing unused variable

[Paul Moore]

On Wednesday, October 28, 2015 09:40:34 AM Saurabh Sengar wrote:
> variavle rc in not required as it is just used for unchanged for return,
> and return is always 0 in the function.
> 
> Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
> ---
>  kernel/audit.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)

Thanks, applied with some spelling corrections to the description.

> diff --git a/kernel/audit.c b/kernel/audit.c
> index 662c007..409482f 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -686,23 +686,22 @@ static int audit_netlink_ok(struct sk_buff *skb, u16
> msg_type)
> 
>  static int audit_log_common_recv_msg(struct audit_buffer **ab, u16
> msg_type) {
> -	int rc = 0;
>  	uid_t uid = from_kuid(&init_user_ns, current_uid());
>  	pid_t pid = task_tgid_nr(current);
> 
>  	if (!audit_enabled && msg_type != AUDIT_USER_AVC) {
>  		*ab = NULL;
> -		return rc;
> +		return 0;
>  	}
> 
>  	*ab = audit_log_start(NULL, GFP_KERNEL, msg_type);
>  	if (unlikely(!*ab))
> -		return rc;
> +		return 0;
>  	audit_log_format(*ab, "pid=%d uid=%u", pid, uid);
>  	audit_log_session_info(*ab);
>  	audit_log_task_context(*ab);
> 
> -	return rc;
> +	return 0;
>  }
> 
>  int is_audit_feature_set(int i)

-- 
paul moore
www.paul-moore.com

Re: [PATCH] audit: removing unused variable

[Joe Perches]

On Wed, 2015-10-28 at 16:35 -0400, Paul Moore wrote:
> On Wednesday, October 28, 2015 09:40:34 AM Saurabh Sengar wrote:
> > variavle rc in not required as it is just used for unchanged for return,
> > and return is always 0 in the function.
[]
> Thanks, applied with some spelling corrections to the description.

As the return value is never actually tested,
it seems better to make it a void function,

> > diff --git a/kernel/audit.c b/kernel/audit.c
[]
> > @@ -686,23 +686,22 @@ static int audit_netlink_ok(struct sk_buff *skb, u16
> > msg_type)
> > 
> >  static int audit_log_common_recv_msg(struct audit_buffer **ab, u16
> > msg_type) {
> > -	int rc = 0;
> >  	uid_t uid = from_kuid(&init_user_ns, current_uid());
> >  	pid_t pid = task_tgid_nr(current);
> > 
> >  	if (!audit_enabled && msg_type != AUDIT_USER_AVC) {
> >  		*ab = NULL;
> > -		return rc;
> > +		return 0;
> >  	}
> > 
> >  	*ab = audit_log_start(NULL, GFP_KERNEL, msg_type);
> >  	if (unlikely(!*ab))
> > -		return rc;
> > +		return 0;
> >  	audit_log_format(*ab, "pid=%d uid=%u", pid, uid);
> >  	audit_log_session_info(*ab);
> >  	audit_log_task_context(*ab);
> > 
> > -	return rc;
> > +	return 0;
> >  }
> > 
> >  int is_audit_feature_set(int i)
> 

Re: [PATCH] audit: removing unused variable

[Paul Moore]

On Wed, Oct 28, 2015 at 6:12 PM, Joe Perches <joe@perches.com> wrote:
> On Wed, 2015-10-28 at 16:35 -0400, Paul Moore wrote:
>> On Wednesday, October 28, 2015 09:40:34 AM Saurabh Sengar wrote:
>> > variavle rc in not required as it is just used for unchanged for return,
>> > and return is always 0 in the function.
> []
>> Thanks, applied with some spelling corrections to the description.
>
> As the return value is never actually tested,
> it seems better to make it a void function,

Agreed, I did just that yesterday.

 * https://www.redhat.com/archives/linux-audit/2015-October/msg00125.html

-- 
paul moore
www.paul-moore.com