Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Message-ID: <e97430ae-08cf-56a6-cf11-e08725c8953e@amd.com>
Date:   Wed, 4 Oct 2023 08:35:17 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.1
Subject: Re: [PATCH] vfio: Fix smatch errors in vfio_combine_iova_ranges()
Content-Language: en-US
To:     Alex Williamson <alex.williamson@redhat.com>
Cc:     kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
        liucong2@kylinos.cn, yishaih@nvidia.com, brett.creeley@amd.com
References: <20230920095532.88135-1-liucong2@kylinos.cn>
 <20231002224325.3150842-1-alex.williamson@redhat.com>
From:   Brett Creeley <bcreeley@amd.com>
In-Reply-To: <20231002224325.3150842-1-alex.williamson@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?K2pBdklkSytlSjVaSEo3R1EzeFgrcG9CTnNMbVVoQnc0ZTV2VnM3RGtJYktu?=
 =?utf-8?B?aGNiTlRyUUdZWFgxMFVwTkVsdWNZYTk5Z2xFbGIycVc5cGdMT0EvZFpUZXRK?=
 =?utf-8?B?YjM2VkZxVFJCSzk1dnBUUVhkdG1admovM0MvbU5uck5DbThBTUwvZ29ORzJz?=
 =?utf-8?B?K2hMaVFDNG5RZUU1RlNqVUI5TDRhOXZHWmN2NWZPaGRDdmpwZGlJK1FTM2ZP?=
 =?utf-8?B?eWI0SUUvdVBocHo5bXRzQk1mQldTdjBEYUJNVzhBenhZQnpybmtrTENMak9k?=
 =?utf-8?B?WEN1RE5ObDVURU5sTUpVbEdDSWg3RDBxR3p5dEZuTldUTkFjSnFKQ0lKSms4?=
 =?utf-8?B?OFlxTzFXa2dtSVJyeEcvQmtHbU9FVEVscHltcEwzVVZ0ZGxBQU9aTDU2VXVl?=
 =?utf-8?B?ZVRIZStmRFJNeTBBNHgxbTZCYWtDY0owd1JyQjlENFFsZElaUUpwVHJOR3Vp?=
 =?utf-8?B?TGZqN3QySzgzK2VES2kvZWxWVHdyRHdldGpKL0tiKzQ5aFIyeWRLczdjK3Bo?=
 =?utf-8?B?VEs0U3g1TUZ3MHRaTEhMQTczQmRTZ2k5SW8xVFFyUzB1SElMWHpjaExEa3pK?=
 =?utf-8?B?dE9EeWZFK3QrZlZSOTlIMDlTOVJuYnk5UElXSGJhVmt1dnB5OTF4d29UeGRy?=
 =?utf-8?B?WjhWbk9PeTM1dmtKaTV1d3ZSNERoTXduWXlRWEVDYmozdkhzeEtVUlpIUGIz?=
 =?utf-8?B?aHJIbFRaU2wwYnRJK3lkQkxKZW9YbWZnamV5cE9WZVRIeXNUZjN5UTVqMU5Z?=
 =?utf-8?B?MHQ2NTVDMjJuSTc2c0NLN2liSmhmM2w3VzlIT1NKRGljdkxDOWVXcmFTdzgw?=
 =?utf-8?B?Q21tc2xvdlRiRXNjN05keHE0SXV5QUhYaWE4REdldlhjOUxlUzN1RzQvYjc2?=
 =?utf-8?B?amZYbTBJNUFPRlV2bHF1ODVXOXZzZEt0UzdWbFZBVTJ3RU1Hc3FnVTlwTjBO?=
 =?utf-8?B?OUVVSE9JbWxqSnN4a3Y5MHV6U3pDOG5HWUZKT0hQL0c2ZWlhNDFPMlB6dUZs?=
 =?utf-8?B?aCtPMmxFR2JTU1J0M295bkN2UERyaTJvdThEL3pwcXExYTBWMnJDLzh3eXcw?=
 =?utf-8?B?KytOU1lBMk5GRGpjSGpZTHYzRUtuNjJnZWN1NkZFQk1tOUd5R05xc09TZHEz?=
 =?utf-8?B?c1hvVmo4Mnp5MU5IeUVnK3NaRklGRTQ0WWswWDJFd3c0Uk1HZGVyQXNuYzk0?=
 =?utf-8?B?U1Bab1BBYjFtcjVsSnNZYXhzSnpaRC9WbEl2UTBrZFZJaDhYUlZqVnBNRmly?=
 =?utf-8?B?SHJhYURWTnpWT0g3QjFBKzBtdGVvK2NZTWNtSWp4eUFxcUJzNE9qYWhHT2Fo?=
 =?utf-8?B?S0V0SzVVZ1lycy9tRHlqT0kveE4xbUZ3R1RWTFo1YkFkaDZmREVkN3hUbFFT?=
 =?utf-8?B?YTN1OU5UTmZ2dkhHM2NJQVhtaVZBU2ZwTDBWZzNPQWd1SXlMMXRsZ0QxQitS?=
 =?utf-8?B?cWxxRlVVRHhvUjQ3T2tHWEtIcHcxV2FmMFc1NW5zZlBXMEc1OGY4Z0Y3MW5m?=
 =?utf-8?B?YUpBRncwSDArenVTaGpaWmt5cXEwbDgrNXZOZDVKWnpjRXY5a1R3aTNuUFV3?=
 =?utf-8?B?MTA1dFRKOXZjcEIvRzRGSkdNQWxJV1NSRjlTVVBZWnNsTFJqby9MV05yNDZm?=
 =?utf-8?B?NnR3QVloNEY2YjZReWQ1WHBBL1l3NGVwSk1DanlmWVVoWWNrZlNPTFJtcWo1?=
 =?utf-8?B?d0NEMWd0cUEzWWJaQXRMYjEvM05HYjZ1Q05PQmJrdUxXN01heUs1WnE5eGdT?=
 =?utf-8?B?MVZBZndXSWhoNUNDSngyUFVEMy95NElkT2VuMmVhYUxPZkRRTGJhWFlwd1Fu?=
 =?utf-8?B?VWtCYnBkOEhRT1I0d0ZDZUxVVE54T09menVIRE92byt3SmtDVDFEdVJZcnpN?=
 =?utf-8?B?YXNqZTVuZEtnekdTa0Z6clgxZ2gwdEJ1MkZkNm5aanU5b3NxZXhsRUVhbHR0?=
 =?utf-8?B?WkhaZnZEMUNsUEZuOXpuWkRXQnExekg0UGhRU3JmdjZoM1h0YXExZ2h0bjU1?=
 =?utf-8?B?YVEwVEl0dVMwRHZFelRPbEdMZDI0Ly9tTjVDNUk3UzdXZGo2MUZwWEZSNUs0?=
 =?utf-8?B?UXlhZTVGZE9KMVZzd3YvMUt3ZlZaeDhUMElUN2VLVXVqUVFJTk4yUUhheHpr?=
 =?utf-8?Q?9amH5T76Yo+FxcMxwlHsEz2ez?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1a79960f-de98-478e-18c0-08dbc4ef841d
X-MS-Exchange-CrossTenant-AuthSource: PH0PR12MB7982.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2023 15:35:19.6800
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: v+zivsRTGBcZEmEMaEBPpNJ+NtgAPaKaNlMgwGqlieTKuBt5hjO6VwVpj0ikaKSMlgjyJ2nBPoaUduzcv3wswQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4196
X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
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 (agentk.vger.email [0.0.0.0]); Wed, 04 Oct 2023 08:36:02 -0700 (PDT)

On 10/2/2023 3:43 PM, Alex Williamson wrote:
> Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
> 
> 
> smatch reports:
> 
> vfio_combine_iova_ranges() error: uninitialized symbol 'last'.
> vfio_combine_iova_ranges() error: potentially dereferencing uninitialized 'comb_end'.
> vfio_combine_iova_ranges() error: potentially dereferencing uninitialized 'comb_start'.
> 
> These errors are only reachable via invalid input, in the case of
> @last when we receive an empty rb-tree or for @comb_{start,end} if the
> rb-tree is empty or otherwise fails to produce a second node that
> reduces the gap.  Add tests with warnings for these cases.
> 
> Reported-by: Cong Liu <liucong2@kylinos.cn>
> Link: https://lore.kernel.org/all/20230920095532.88135-1-liucong2@kylinos.cn
> Cc: Yishai Hadas <yishaih@nvidia.com>
> Cc: Brett Creeley <brett.creeley@amd.com>
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> ---
>   drivers/vfio/vfio_main.c | 10 ++++++++++
>   1 file changed, 10 insertions(+)
> 
> diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
> index 40732e8ed4c6..e31e1952d7b8 100644
> --- a/drivers/vfio/vfio_main.c
> +++ b/drivers/vfio/vfio_main.c
> @@ -946,6 +946,11 @@ void vfio_combine_iova_ranges(struct rb_root_cached *root, u32 cur_nodes,
>                  unsigned long last;
> 
>                  comb_start = interval_tree_iter_first(root, 0, ULONG_MAX);
> +
> +               /* Empty list */
> +               if (WARN_ON_ONCE(!comb_start))
> +                       return;
> +
>                  curr = comb_start;
>                  while (curr) {
>                          last = curr->last;
> @@ -975,6 +980,11 @@ void vfio_combine_iova_ranges(struct rb_root_cached *root, u32 cur_nodes,
>                          prev = curr;
>                          curr = interval_tree_iter_next(curr, 0, ULONG_MAX);
>                  }
> +
> +               /* Empty list or no nodes to combine */
> +               if (WARN_ON_ONCE(min_gap == ULONG_MAX))
> +                       break;
> +
>                  comb_start->last = comb_end->last;
>                  interval_tree_remove(comb_end, root);
>                  cur_nodes--;
> --
> 2.40.1
> 

LGTM. Thanks for fixing this.

Reviewed-by: Brett Creeley <brett.creeley@amd.com>