Message-ID: <32fdf39c-9772-61a1-e0d7-40a564f640a2@intel.com>
Date:   Wed, 1 Mar 2023 16:13:40 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.8.0
Subject: Re: [Intel-wired-lan] [PATCH net] ice: copy last block omitted in
 ice_get_module_eeprom()
To:     Petr Oros <poros@redhat.com>
CC:     <netdev@vger.kernel.org>, <intel-wired-lan@lists.osuosl.org>,
        <jesse.brandeburg@intel.com>, <linux-kernel@vger.kernel.org>,
        <edumazet@google.com>, <anthony.l.nguyen@intel.com>,
        <kuba@kernel.org>, <pabeni@redhat.com>, <davem@davemloft.net>
References: <20230228204139.2264495-1-poros@redhat.com>
Content-Language: en-US
From:   Alexander Lobakin <aleksander.lobakin@intel.com>
In-Reply-To: <20230228204139.2264495-1-poros@redhat.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TUhoU0NFdmNUaUh5cy9TTHMxZHVwQStkTFV1TTFaVmFpT1VYV1JsMEtheGJm?=
 =?utf-8?B?dzBUQ0p5dmhWa0JTWjZQd2oxYWFpNk9RaFNQaURrYUowQmVCNXNXbG9SbjEy?=
 =?utf-8?B?OElmWWNPZ0JRMTN1ekZva2M5a2tIbTVDM01VdmJ0Tk5JTDZFQ2UzZFZkTmlV?=
 =?utf-8?B?VXdCRVBCVVdVUGZzSjF2VEhwMmwyQ2NnOU5NSFpVQU9IRzBWMHRQSExWcnZ0?=
 =?utf-8?B?algxTzBaNWNDU2tHdHAyK0NmZlkxNGhxVWhSWlM1YU5kUExmbzYrQmtUU25w?=
 =?utf-8?B?Rlk4L0NNMGM2QXB4VTNuMTJyMXo0SmJkcjYrTHNFWEJrZW0wWFdLamJISDdS?=
 =?utf-8?B?V01nSzFIS2swZXkzdzE0U2gzTTYvT1JuYUJXSHJYMUpWSzFHNmN0V2lzb0Yr?=
 =?utf-8?B?dGFtdnlGUjh6ZWhCc05TZDZ2dGRsbjV3M2Z0OXlzLzRIWGJvU3lrU2J5WWEy?=
 =?utf-8?B?c04vRnV6NHJMZ2FZZ04yL1R2VnVORXVNYi9YL0plY0t5ejNVSW93Ym5GanJ5?=
 =?utf-8?B?SEJtSkhQckNqZS9xR2ZaUDFFK3JSSlFXZ05HMTFSaDhxMWhwREFxWmRwdXpn?=
 =?utf-8?B?bW9BWHVlLzUrRVU0YytZRHlHQzNwL3F3cGlqUDJnMDRiNW9OeTFQNEIzekpx?=
 =?utf-8?B?eUJBUVczYndkc0sxeGwyalFCV1BEekxsYWJsRGU3VCtWZzczQUhVcGV2TmhF?=
 =?utf-8?B?T0I2MWV1WllUQ0cvalA3RW5MQW85L3VNWUFMdDEvUzgxajNvUCt3V2g4ZndR?=
 =?utf-8?B?U1ltbmtNL0hJU2tKMDFldjFpSjlveUJVcmFoc0FJWUhydU51VG1tNlJUNnJ3?=
 =?utf-8?B?eTRmYXZGd09ic2JFWUROTXpaNXQzTTBNeFFVekhrR1lweUZSQTdQeWtXWkg4?=
 =?utf-8?B?dW9EUkhmUjd6aitNc0cxdkFWS0JnemwyRm5nYVlLcjVZTXkyaEtGemhQKzFz?=
 =?utf-8?B?dWZWN01QRms2TFQxSDRkc3hKVlZjTkFWclBVWkJzK1F3a041Q1NpRlMxNXVy?=
 =?utf-8?B?ZWpkYXo3VTFIT1NDZ0wzdnIxamhOUGxkblZWOVZKeEtNUWw4WllIUUZHS1Rv?=
 =?utf-8?B?UnpQcXlCc1pBSXFQNE81K09iQzE2UnZ6dlM4SkU1ZWxHS0o0ZG5vMEk1ZGtl?=
 =?utf-8?B?YUJmUitlTGUwbmdsOXBPaWd2R0pIVzBvUWVYSXU0SVRyZmlxaU1ML1g4aW13?=
 =?utf-8?B?V2hEQjd4RkNUVXY2WUVMUmM1L3dhTk1jSUptOHU4WFk5SjczdW8vbktiVTVE?=
 =?utf-8?B?T1lkSTY4Uis4RitDM01MdVFYK3dDQno4N2dCZ3VIRHJ6QTlLdzNCWlphS1lu?=
 =?utf-8?B?ZEEvWE5QYTN6MG81VnpRRWhFY1gzSG14VEdabFpwb1RkbGdxdVZmbmxoa0ty?=
 =?utf-8?B?MVVOQ3R2bEdwdXFvMEdHRElrSS95dURmZlhoOUpLS3VGMTRDSGNvZGszSmho?=
 =?utf-8?B?bjNWRE9mT1ZQakY1YURUR1dTeU5kRktiMmt0aVdHZkV3RnlJUkoxN2VjSGI5?=
 =?utf-8?B?ZFVEbndKU0FMRHhOUnAvWnlYeVEyeFpaSzNpNG9rTDAvZW5LbUo3eHJQUUV2?=
 =?utf-8?B?UmFaditjWkJZVEYzSVUxVW5QRkpkUXpaNlo3UWZTamhKNmJTUm9WVnJjVFRF?=
 =?utf-8?B?Q1gyekt2UnBxSTlDMGNlRXAvTm5nNFRpejh1Nkd3azFaNzF5UFl2WXVOMWRJ?=
 =?utf-8?B?cU5ScGdxVUxaOURmQlZGMEFFTzBjcUhieUxFOGNYNzN1cmp1WW9NRncrdlVt?=
 =?utf-8?B?K3hybFhnT3V4d0c4ME5ISFU5cGE2RjFUbkdhSWF6aHhzRE9JVGk5QlhGaW5r?=
 =?utf-8?B?d1JiWVJodmhvTG42VFlialNCSzdHSUVWYUlIY2JBaGFnMk5Jemdjem1ONFVD?=
 =?utf-8?B?TEJFZzY2QlFYSU5JZnJHNk5uaWtBQWQwWnl1YVRhVU10RjlhRXRFU0ZXSW9B?=
 =?utf-8?B?OUVQRWc4WWlCSDZ0cURBOG1pcFF0TkN4VXdlZXR2YkpQNFdrendBTWtxMVBE?=
 =?utf-8?B?SUhRZmtXL0htWkF5RlVLQnZxM0xxdG9CcEwwOTZuWjRMZ1FRV0djcXRLMmJh?=
 =?utf-8?B?S1o3ZFFUVWVEUlYwakI4NkF4NFhhTVpHTzN6UTErVnFaT2s3QzIzeXh6bDZx?=
 =?utf-8?B?RjhmTjI0RnRwZGN5MU1zdVh3WTNWSU1jMkJKdmVwMi9mT3RmZTIyOVhKcGc1?=
 =?utf-8?Q?OQp8hL4xY2C8GjKnvaXSVXE=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 54523893-1ae6-4775-e22a-08db1a67a1e4
X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3625.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2023 15:14:20.6111
 (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: IvBzKvzNBk2+WW59smNyyIlZKEatvKFBEq/JxyFKgnE1NGuC9H34VPNUvj25gwhet8i01WM+EHtDDQIOcw1a2SAmRGIdsNzmqYzhOK4RT/8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR11MB7838
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Petr Oros <poros@redhat.com>
Date: Tue, 28 Feb 2023 21:41:39 +0100

> ice_get_module_eeprom() is broken since commit e9c9692c8a81 ("ice:
> Reimplement module reads used by ethtool") In this refactor,
> ice_get_module_eeprom() reads the eeprom in blocks of size 8.
> But the condition that should protect the buffer overflow
> ignores the last block. The last block always contains zeros.
> Fix adding memcpy for last block.

[...]

> diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> index b360bd8f15998b..33b2bee5cfb40f 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> @@ -4356,6 +4356,8 @@ ice_get_module_eeprom(struct net_device *netdev,
>  			/* Make sure we have enough room for the new block */
>  			if ((i + SFF_READ_BLOCK_SIZE) < ee->len)
>  				memcpy(data + i, value, SFF_READ_BLOCK_SIZE);
> +			else if (ee->len - i > 0)
> +				memcpy(data + i, value, ee->len - i);

Maybe just unify those two?

			copy_len = min_t(u32, SFF_READ_BLOCK_SIZE,
					 ee->len - i);
			memcpy(data + i, value, copy_len);

That's pretty much a reword of your code.
The functional change is good to me.

>  		}
>  	}
>  	return 0;

Thanks,
Olek