]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
x86/resctrl: Remove unnecessary check for cbm_validate()
authorBabu Moger <Babu.Moger@amd.com>
Wed, 28 Nov 2018 22:42:47 +0000 (22:42 +0000)
committerBorislav Petkov <bp@suse.de>
Thu, 29 Nov 2018 07:36:12 +0000 (08:36 +0100)
The Smatch static checker reports the following error after commit:

  a36c5ff560fb ("x86/resctrl: Bring cbm_validate() into the resource structure"):

  arch/x86/kernel/cpu/resctrl/ctrlmondata.c:227 parse_cbm()
  error: uninitialized symbol 'cbm_val'.
  arch/x86/kernel/cpu/resctrl/ctrlmondata.c:236 parse_cbm()
  error: uninitialized symbol 'cbm_val'.

This could happen if ->cbm_validate() is NULL which could leave cbm_val
uninitialized.

However, there is no case where ->cbm_validate() can be NULL as it is
initialized based on a vendor check. So it is either an Intel or an AMD
version it points to. And in both the cases it is initialized properly.
Thus, remove the first check.

Verified the fix running Smatch.

 [ bp: massage commit message. ]

Fixes: a36c5ff560fb ("x86/resctrl: Bring cbm_validate() into the resource structure")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Babu Moger <babu.moger@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20181128224234.22998-1-babu.moger@amd.com
arch/x86/kernel/cpu/resctrl/ctrlmondata.c

index 03ee13235a45dcbf80c28341963f9dd6a95e2dac..ba11f54f5ab8fc6b64a4128df6cb49af02ce5dae 100644 (file)
@@ -219,7 +219,7 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,
                return -EINVAL;
        }
 
-       if (r->cbm_validate && !r->cbm_validate(data->buf, &cbm_val, r))
+       if (!r->cbm_validate(data->buf, &cbm_val, r))
                return -EINVAL;
 
        if ((rdtgrp->mode == RDT_MODE_EXCLUSIVE ||