2023-12-28 02:56:45

by Li zeming

Subject: [PATCH] kernel: auditfilter: Remove unnecessary ‘0’ values from ret

The ret variable is assigned when it does not need to be defined, as it
has already been assigned before use.

Signed-off-by: Li zeming <[email protected]>
---
kernel/auditfilter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 8317a37dea0bb..be8c680121e46 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -788,7 +788,7 @@ static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)
static inline int audit_dupe_lsm_field(struct audit_field *df,
struct audit_field *sf)
{
- int ret = 0;
+ int ret;
char *lsm_str;

/* our own copy of lsm_str */
--
2.18.2

2024-01-04 21:30:59

by Paul Moore

Subject: Re: [PATCH] kernel: auditfilter: Remove unnecessary ‘0’ values from ret

On Wed, Dec 27, 2023 at 9:56 PM Li zeming <[email protected]> wrote:
>
> The ret variable is assigned when it does not need to be defined, as it
> has already been assigned before use.
>
> Signed-off-by: Li zeming <[email protected]>
> ---
> kernel/auditfilter.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Thanks for the patch, as this is not a critical change it will be
processed after the upcoming merge window closes.

> diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
> index 8317a37dea0bb..be8c680121e46 100644
> --- a/kernel/auditfilter.c
> +++ b/kernel/auditfilter.c
> @@ -788,7 +788,7 @@ static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)
> static inline int audit_dupe_lsm_field(struct audit_field *df,
> struct audit_field *sf)
> {
> - int ret = 0;
> + int ret;
> char *lsm_str;
>
> /* our own copy of lsm_str */
> --
> 2.18.2

--
paul-moore.com

2024-01-25 15:09:42

by Paul Moore

Subject: Re: [PATCH] kernel: auditfilter: Remove unnecessary ???0??? values from ret

On Dec 27, 2023 Li zeming <[email protected]> wrote:
>
> The ret variable is assigned when it does not need to be defined, as it
> has already been assigned before use.
>
> Signed-off-by: Li zeming <[email protected]>
> ---
> kernel/auditfilter.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Merged into audit/dev, thanks.

--
paul-moore.com