Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Message-ID: <215ebf8f-1b64-3b9d-1952-350939827da8@intel.com>
Date:   Fri, 15 Sep 2023 11:06:30 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.0
Subject: Re: [PATCH 06/10] platform/x86/intel/ifs: Validate image size
Content-Language: en-US
To:     =?UTF-8?Q?Ilpo_J=c3=a4rvinen?= <ilpo.jarvinen@linux.intel.com>
CC:     <hdegoede@redhat.com>, <markgross@kernel.org>,
        <tglx@linutronix.de>, <mingo@redhat.com>, <bp@alien8.de>,
        <dave.hansen@linux.intel.com>, <x86@kernel.org>, <hpa@zytor.com>,
        <rostedt@goodmis.org>, <ashok.raj@intel.com>,
        <tony.luck@intel.com>, <linux-kernel@vger.kernel.org>,
        <platform-driver-x86@vger.kernel.org>, <patches@lists.linux.dev>,
        <ravi.v.shankar@intel.com>, <pengfei.xu@intel.com>
References: <20230913183348.1349409-1-jithu.joseph@intel.com>
 <20230913183348.1349409-7-jithu.joseph@intel.com>
 <b189850-ce7c-d8fc-ecd-1a843f52b916@linux.intel.com>
From:   "Joseph, Jithu" <jithu.joseph@intel.com>
In-Reply-To: <b189850-ce7c-d8fc-ecd-1a843f52b916@linux.intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?emFvU3JvNXo1N1RwY0duWXAxcEd2OE1CSDBNcm9NQ3ozeUtnSnZMR09qVGVY?=
 =?utf-8?B?WmdYVmFVUklBSDFWUzBDdWlUWFBsbWQwVUZmWTE4aklZNlpRamFSVzg3VXE4?=
 =?utf-8?B?T3hubzRSMUN3ci8zMzFkcmZlYkRkZU55Nmp5S2hBb29Qd05EQXVzUlk0TWlV?=
 =?utf-8?B?dlBqMmtLQTkydlNwa29hZDh1bTVuYWhYSGZ1VWdocG1YMVNSVkRUeFN0UWVu?=
 =?utf-8?B?czRYcWJaL2xxaHpMQjhvb2txM3pOUmdaV1RYWVlQK0FyUGVSdU5qMUFYS1lF?=
 =?utf-8?B?S0djSTVHSm5zYjVKRjY5RW5NemNQN0lYNDZVblo3YlR2N3ZRR09jRG54V2Iy?=
 =?utf-8?B?OXdhWlJzcitMaU8zVEpjeG5STHVjRVZQc2NzN1J2V3hoQURLSVBibUFwbENn?=
 =?utf-8?B?R1RSZFZQbE5VcFNKOUg5MmNQOG4rY0FpTGppbjIvZURUUklqemFQejhrcjE3?=
 =?utf-8?B?cDhDRFF0UkdLNEEyM2pkeFludWtpSG0yYmJKa0xBZDl3QWVUamlORzVYR0xO?=
 =?utf-8?B?ZHY2enVVQkpQZ0I2L1d1b013dTduelF5eUdLalg3eERHSlNZK2s2blZ3WHlj?=
 =?utf-8?B?RWpLbUgyc210MkdIMG1vczhFWnZTc2hkY1ppaFdJME5GNzVPaWdnbFdjdTJ0?=
 =?utf-8?B?dkpIZ21mNDBXTEFsdWVlS0ErTVdJenF4S0VFdFhUL2NhNEdtcmpkUXEyMGhz?=
 =?utf-8?B?eGtieUZRaDF1eGF2bXFRY3VBZnVlNXgwWG04Um5USlRJZ1pueUZ1VDRlSFR1?=
 =?utf-8?B?MjVRZzNwejV6MmdmaktaZVo1QVdRM3pvRExNNFdRb0NWakRRVXExbkxnMUdS?=
 =?utf-8?B?UzlLaWpEcEVvOGFvdjRyTkQ0aFFGeVF1ZVZsV2Rmbng5YXdtdXpXaC9RQldR?=
 =?utf-8?B?c0RCemJYOE5IQkdEN2NuNnBtdmtxREs5MEhrd0JxeldTb2NFYUJzNGVUUUkz?=
 =?utf-8?B?MmtMNWJWdVpaWXlYYkFseTkvUFZLbVdPaDdHbXluZElwNlkxREdkUDJlTnpl?=
 =?utf-8?B?NzBsandpcGNSZ0tJc3A0T2FhU1cyTFFOSnBvamZaVFFrM0l5N3F1b1MrNVJs?=
 =?utf-8?B?L05JZ3BuTk9JZFpEZjJuYjdnaGtTajNwOE4zY0xjK1dmNTVNYXVWWUgxNGtk?=
 =?utf-8?B?Rkx0NmVaZExqUHRGV255TjJQRERieEJKclZiZUhVdWJIRmF0bGNVNnd3N1Qx?=
 =?utf-8?B?TmM4QjF5MWRNdHl1Y2ZCNWtzTGFFcERSd3FkL0Mvd3JKdzVWbG1UZ1dVMHI3?=
 =?utf-8?B?VUJFTk81RkRiMXloMGE4RDBKbDhZdjdqd3NLQ1Z1NTdSYS9BVmd3WG5CY05F?=
 =?utf-8?B?dUk0MGRUNFpDdWZyZE9UcEtnaVFFR3NFZWFmNDV4VGl1RmM0MWs2VnNNQXBW?=
 =?utf-8?B?RVdLK0tqbDBEWXY0QXNJRmxxOWlrb0tSOEgxb1lFeUlHVW5VTEVkamd5ZUtl?=
 =?utf-8?B?WXpzT0xScU5CUElXZkNSOEVZUFRtRDJLTGoxRGtJSjN1VTZXdHlnLzhhTHdW?=
 =?utf-8?B?Uk43S1lyUENjTTlleHFLUG1EYVh3M3BOVW83UWMrQ2ttL1V6V3lkSzRuMWlu?=
 =?utf-8?B?R3prVUlGeE9RZXpremJsQkZreXdSVmJRWHhEWU5pdXV2eVlsbWVSa0lPSUFD?=
 =?utf-8?B?VXJ4MU5wWldKNkYvblE3OU5xL3BGV3VlQjNib3h3ci9JRWVPR0Z2cTFSVC9h?=
 =?utf-8?B?MEpoNkdZSmRXYjdneWtqejdWN1dHWVdXVnJpdmdzSS93TGc0ZUZrUUJDZEcr?=
 =?utf-8?B?ZVFxblJWbkFORURidE1sTzZWZ25pVUtDMlRVWFR5bmlTbHV3bXNzNFVIRVJF?=
 =?utf-8?B?eDQ4VGh6eXFCbzFGT0dKRmJ4Mkk5NGJBNkdkNW1JOW9mN01TdGxJMFhTZlYw?=
 =?utf-8?B?TFhNdXhJNWRpYUFyUHVrYjFDYmJNNFhmUWg4ckpmNnYwdUZmblFsMytVeWxI?=
 =?utf-8?B?YnhHV01FbjVDeU5Cams4aGlMcDlFY0lHVnN0cy9qNzJ3VVByY3FacmtDclJH?=
 =?utf-8?B?L2phc3hoVUZWZVgwQVc0Y25hWnQ4aHNzT25rM0NVcDhiVVFQczlZSEFkSnhS?=
 =?utf-8?B?ZFo0Z1Rma3hsaEw2MWlUQjNpdkk0cSsxUGRxNWZGSUFZMXRFRSsrRmsxQ0or?=
 =?utf-8?B?eHlWOENqT2lsbEVmVjUwR2VoV1lidW1mVGFYY0t2UnlaZDFHRXVtK3JoeTNS?=
 =?utf-8?B?eVE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 5cb13a82-4368-4e75-6c98-08dbb6167f71
X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3768.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2023 18:06:34.8374
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: by6X+f/kkVTXtkiCi+e7L7qx0UzSdfAleQHthKOPL/Ye+uwKRGmXMUtDhREo299QvMBRXMFf/ARebD1g9NwO/A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB7190
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 15 Sep 2023 11:08:52 -0700 (PDT)


On 9/15/2023 9:57 AM, Ilpo Järvinen wrote:
> On Wed, 13 Sep 2023, Jithu Joseph wrote:
> 
>> Perform additional validation prior to loading IFS image.
>>
>> Error out if the size of the file being loaded doesn't
>> match the size specified in the header.
> 
> Please fix these short lines in all your patches.

Will do

>  
>> Signed-off-by: Jithu Joseph <jithu.joseph@intel.com>
>> Reviewed-by: Tony Luck <tony.luck@intel.com>
>> Tested-by: Pengfei Xu <pengfei.xu@intel.com>
>> ---
>>  drivers/platform/x86/intel/ifs/load.c | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>>
>> diff --git a/drivers/platform/x86/intel/ifs/load.c b/drivers/platform/x86/intel/ifs/load.c
>> index e8fb03dd8bcf..778a3b89a24d 100644
>> --- a/drivers/platform/x86/intel/ifs/load.c
>> +++ b/drivers/platform/x86/intel/ifs/load.c
>> @@ -376,6 +376,7 @@ int ifs_load_firmware(struct device *dev)
>>  {
>>  	const struct ifs_test_caps *test = ifs_get_test_caps(dev);
>>  	struct ifs_data *ifsd = ifs_get_data(dev);
>> +	unsigned int expected_size;
>>  	const struct firmware *fw;
>>  	char scan_path[64];
>>  	int ret = -EINVAL;
>> @@ -390,6 +391,13 @@ int ifs_load_firmware(struct device *dev)
>>  		goto done;
>>  	}
>>  
>> +	expected_size = ((struct microcode_header_intel *)fw->data)->totalsize;
>> +	if (fw->size != expected_size) {
>> +		dev_err(dev, "File size mismatch (expected %d, actual %ld). Corrupted IFS image.\n",
>> +			expected_size, fw->size);
>> +		return -EBADFD;
>> +	}
>> +
>>  	ret = image_sanity_check(dev, (struct microcode_header_intel *)fw->data);
> 
> It looks than a bit odd to add the check here and not into a function 
> called image_sanity_check()?!?

image_sanity_check() validates the contents of the image, whereas the new check
in some sense validates request_firmware_direct() results. Hence it was placed
outside of content validation / closer to request_firmware_direct()


Jithu