Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Message-ID: <3cb7f5d1-ed78-7b36-472f-1fbe9e2d26b6@intel.com>
Date:   Mon, 25 Sep 2023 11:24:21 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.1
Subject: Re: [PATCH v2 5/9] 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:     Hans de Goede <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>, LKML <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>
 <20230922232606.1928026-1-jithu.joseph@intel.com>
 <20230922232606.1928026-6-jithu.joseph@intel.com>
 <318e7426-fcab-c1e4-6e84-752c332088f2@linux.intel.com>
From:   "Joseph, Jithu" <jithu.joseph@intel.com>
In-Reply-To: <318e7426-fcab-c1e4-6e84-752c332088f2@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?RGtoMmtOUHhBUmhwbFI3MC9mQ3R3bUhCZ2o5dXE2MmY1YVdoVUUrRVBWUVFM?=
 =?utf-8?B?V2tHRGc1bzY3amJvbktEdUZOSDV0bWJkSmFuVFFFSEFWUjY0KzFBYVY2Q1g0?=
 =?utf-8?B?MVVON0NjSjEzOHBxS0NUa1U5REVPZ2VEVDVSbENtWllLWEpvK0wrU29Ka3hj?=
 =?utf-8?B?TEo3d2FRSG0vNExSN0FKWHhjemFCT3hYcXMwTTNZY0JiMHc1bzVjbnU2TUhY?=
 =?utf-8?B?RFowa0RsblJpMUJtQTFGcHQrVGhheEFXVHlTRWZMSmNWajRiZXdXZmNMSnBr?=
 =?utf-8?B?MVoxMXJVNHBxWUJLOGhPWHJ5MEJDQ05idzZ0aE5YUUhPMzIxK2Z3aUo5Y1lB?=
 =?utf-8?B?WlJOOWVaNCtFY1R2SlJUWDliTmdBeXN2a3pDamFYZkpKN2QzZk9qMmRCVDdS?=
 =?utf-8?B?WVYwMTZPT1F2elNqTzZDQUcrRDBEb2JXQW1BRjFVN3ZjeFl3ajByanl0SzY5?=
 =?utf-8?B?WWhpaWh5bEdnaUw4YnZHTVVUaWR5TVFKeGdsOHZ1T3NwYjZORGNYSkpnZmF3?=
 =?utf-8?B?NDhQUmZBRFVldGxmZGtSSCtpY2pobVBMNXhycVpSUUE5QUhzQkM5YmNWLzQ0?=
 =?utf-8?B?cDduSTlybDBuNFdFWUNVdyt5aFFuVXRWNVdZWEJnVWNYbkVNNCtoUTJ2TW5t?=
 =?utf-8?B?cXZzT1RhcGxXN0w2U0pwckcxWW14dWpIQldMSTE5NU5IMjVYWmZWcHZ4YmJ5?=
 =?utf-8?B?MXBHNDZxWjVZT1prREdHbjZIeHhaQnBidDR2YkJwVWFLcTR5L093c2YzQ2xZ?=
 =?utf-8?B?VTMzcGpYR1M4SmxjK2tmeVFQU2NZME1qeTEvMEs3UWdFNy8rRkhJNFgzQW1I?=
 =?utf-8?B?TThNRFNWOVovV0xDdjRKb1NmK2wrRHNORFZ2bW5hdzV4cFAzNDRQbjRVTFNr?=
 =?utf-8?B?UEFJZ29ZbWoySzVZaXVOUUtvdCtLZThzSlpVZHhFU2V3enpwZHU5bWxZd0Iv?=
 =?utf-8?B?YVh1UmNZQlNuc3dqTEFQZDJleEpEQ1ZwRTJkU0tEV2gzbysyRzdiaTFPTFpE?=
 =?utf-8?B?Vkp5U1dkT2lxNkxKK095TjhOUEptbHdvUnBEWGxnNkt5Q0IrcjdSbll0UzFH?=
 =?utf-8?B?bUJvekpQZGNxVkc4OGxrckkyekJPT3FZaXMyVmhhMGlZMm9LbDVyRDFwaHJY?=
 =?utf-8?B?R0NHZy9wVzBOZ2VuanBEK2VJMkhUeU5OeFJiUE5uZWYzQXpQd3FQdVdINFpi?=
 =?utf-8?B?R054R2JxdE5ZSEQyb0M4L0pzZjZiMVd5SDlGNGdpVDA5Sk9kTmxIUUxodlNx?=
 =?utf-8?B?ZjVjVTIvSmwySUlHY0xrQmtWYlpqLzhwUlBrYVE3OXRranUwM2Zoc0FUQjdM?=
 =?utf-8?B?VFNKMUJsL1ZYRzNGZlpTZnY3NUdsOHEwZ2l1NTZ4c3dXVUZETHFWdDVPcWk5?=
 =?utf-8?B?VHBaQjJ3VmJyVGtmMDRXbXRPRzd6dHFhUU1iSjd3aGFuR1dEZms5M3NXT3dO?=
 =?utf-8?B?dElNTTVGd25WVElJLzRmaDZqeEpmdVJlRGtDOENoaTZ5NmZHdExrNkl3WkJr?=
 =?utf-8?B?SE9CTURGWTBTa0FsWTRKMnJzM1hWdVJxN2drd1l6enl0Rmw4K2c5Z2ZnbjJo?=
 =?utf-8?B?SExXaks4NGVKZ29IdmMwNHVrUDRPOWNzSnNYbXYvZXM4QVhmcVNOVWQyYkc2?=
 =?utf-8?B?ZjV5NVlIelpRQUJ5OEp4d2daQnZLRDFxMm53TXI3bEhjcHM3ZCsyNUJBS1py?=
 =?utf-8?B?aGlCR0c2bDNUZVVVcW5sVlB5YnlpN3NSTDdVelRUWnFmY2V1S3lxN0dBeEZ4?=
 =?utf-8?B?anNvc3dCK3BUZDRNZGlQdVU5NlloMWZORFE3YUxlUlFhckZPQWZWNVdFQ3Av?=
 =?utf-8?B?THE4R0lnVEEvQzVqRExiVHZUL1k5R243Ti9HWkNiWXIwdmxDZVFreVE3YVlG?=
 =?utf-8?B?NXd4ZXJBbENjbTFIb3R5ZjYvYW9CWlBkL0lHbkV4VFhIbEk5RWJwVFhmOGJ2?=
 =?utf-8?B?aWozUFJscjRuc0Vyb1RNK24wVmttQUtRU2hJTU5CR2lDVXY3K1V5YjdBQ2Yv?=
 =?utf-8?B?amtwUTFmZi9WS01TUjdUclBRdmpKbHlpSFlCRzBjTHArTS9UOU81ejh5cFJq?=
 =?utf-8?B?OGQvUFo2R0ZMS0Z1T2g3TE5Wb25qSmRBcGx0OHJoUC9RQmZpdU5FMk1RanJ2?=
 =?utf-8?B?WXZ2bG03dUlsV3RGZ2YvbnQ4NXZHdjZWTG5WejVjb0RrMUlLNFBxQzBNWFBo?=
 =?utf-8?B?RVE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 92f58f3a-d0a3-4ba2-7045-08dbbdf4a5df
X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3768.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2023 18:24:25.8963
 (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: t8hAjmebKyiLnJf5V8cEE6C6SdVS0zlDhasMnjxssbk/6x1upSj8dgL8T8YcryN55dD3nvoLj3uM5dpluU5zIg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB7007
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 (howler.vger.email [0.0.0.0]); Mon, 25 Sep 2023 11:24:44 -0700 (PDT)


On 9/25/2023 8:43 AM, Ilpo Järvinen wrote:
> On Fri, 22 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.
>>
>> 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 6b827247945b..b09106034fac 100644
>> --- a/drivers/platform/x86/intel/ifs/load.c
>> +++ b/drivers/platform/x86/intel/ifs/load.c
>> @@ -375,6 +375,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;
>> @@ -389,6 +390,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;
> 
> I don't think this error code is best suited for what occurred. I guess 
> returning just -EINVAL would be fine.

Will change

Jithu