Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <60859f1d-3ca1-8318-705f-2964834f071d@intel.com>
Date:   Wed, 3 May 2023 13:26:27 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.10.0
Subject: Re: [Intel-wired-lan] [PATCH net v4 2/2] iavf: Fix out-of-bounds when
 setting channels on remove
Content-Language: en-US
To:     Ding Hui <dinghui@sangfor.com.cn>, <davem@davemloft.net>,
        <edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
        <intel-wired-lan@lists.osuosl.org>, <jesse.brandeburg@intel.com>,
        <anthony.l.nguyen@intel.com>
CC:     <keescook@chromium.org>, <grzegorzx.szczurek@intel.com>,
        <mitch.a.williams@intel.com>, <linux-kernel@vger.kernel.org>,
        <huangcun@sangfor.com.cn>, <gregory.v.rose@intel.com>,
        <michal.kubiak@intel.com>, <jeffrey.t.kirsher@intel.com>,
        <simon.horman@corigine.com>, <pengdonglin@sangfor.com.cn>,
        <netdev@vger.kernel.org>, <linux-hardening@vger.kernel.org>
References: <20230503031541.27855-1-dinghui@sangfor.com.cn>
 <20230503031541.27855-3-dinghui@sangfor.com.cn>
From:   Ahmed Zaki <ahmed.zaki@intel.com>
In-Reply-To: <20230503031541.27855-3-dinghui@sangfor.com.cn>
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?R21XekRIUFNEL21tQXc2NmZBZE5mOGhUYXZjYUorQ2p2dVBjQ1NZQnBwREIw?=
 =?utf-8?B?bjJ2U3FJRmVRellyQmcva0pPZ3Y4UkFYTEk2dm15eEZtOE5CSEZGSTdiTC9v?=
 =?utf-8?B?VlRWeUJhNTYrSGZOM0ZtMUZ5RGJ5b2Q3djQxcSs5UVlSZWU4UWdTWmRrckNx?=
 =?utf-8?B?LzhkbU4vbjdoQTNFZzcrdDZSVGg3OWdzYlhYc2IwNGJJSFl5cEFpWUhmTTl1?=
 =?utf-8?B?Z3JEWnNtK2o0ZktYaHJzN0NxNC9tRXVjMSszV1c0SDdNL1VNaXArNVN2Z3Za?=
 =?utf-8?B?bzFxOGZEZEhBRWJtZ3dOU3hFTCtPSkxZdDhUUzFHZG9GKzdLNmlZV3RtKzRj?=
 =?utf-8?B?QkgrSlY1WTRvR3p2bUFqVjRHQWJ0M0Z5NUVONVRnWVBOeWEwejVIRFBxTVE0?=
 =?utf-8?B?QkJUeVpnSEJ0bm5qMVJheXl6RzBHOW5tVEgrYzVNNmRLdXFFQWVIc05NUHE2?=
 =?utf-8?B?ZVlNNldPN2xDOGdHQWcvaWVnNGpWTGd3dkhTTitaK3BSeGR4eDdZZVl0QWRX?=
 =?utf-8?B?UjlvdWRLbkVDc0tQRUkzUmlyeXgvMi9OWG8wWjJTZ2grbG9qQUJ3M2o4K3FY?=
 =?utf-8?B?dkV4RDFqREMzenU3d2lGSlY3ak1wbVFiYWh0ZFhhcFB2MTZZU1ByV1FiVHRy?=
 =?utf-8?B?UEFabGVKcnp6VlA2aTYxdVJlR1RoSktERktjbWpzTG8vbXFVUEwxSmFPZmZs?=
 =?utf-8?B?VU5qcnE0OUNnbWIwTGJVem15cThISVVZZHhoZ0Z2djYydjltaGNmcTM2UWw3?=
 =?utf-8?B?U3NGdmZ2eGJCREFvRzVqdkM2NHpVSStDMUtDZjZQeWpTcmY2dFZMMVMrZ0F3?=
 =?utf-8?B?NnEwVmJDWWxkUEdHV2JKbTVnNElTd3FydHVudlVyVGlRbWIxSjRDb1BaczVj?=
 =?utf-8?B?Q1NRTnlvV3h5RTZoRGFPSXlDdFFGWFZmcUROYlgvdm5URWJ0bmxSTmpqbTN1?=
 =?utf-8?B?aGJJNmZ4ODQ3Ymw4dExaay9OVUdJbjhkazNzd3VJMk90SlBRdXhPd25QN3g2?=
 =?utf-8?B?Z0FXanVPWWxhNURaT20rWkttVFlLL0NSZVZ6RjMxRk5VZTNSSzM2U2k5bHlk?=
 =?utf-8?B?dTZsUjJnd1dmWXpQdXFxeTVXMjFQK1d1V0ZSdnNkdnlzeEFaeGJSYk1YUk5X?=
 =?utf-8?B?ZVp5LzZJSWF5MkZzTmMyMDA5emhRVEUzeStseDhaVTRYVUVwUElxQlU0Nml6?=
 =?utf-8?B?TjVjZ1l4TzdVSVVCditVS09OcU13UWs2U0lQMHU5VmY5bDJXTHJhdEpJaWYy?=
 =?utf-8?B?aVppTXI5ck00S3JLRi83ZUVBSVRqd2NaUGoweXV6ZjlXZmlNQnFtM1FISnF0?=
 =?utf-8?B?NktQM2VRZy9hT3dRQStOaklLK2JaWFpHcnIvbWcycHVUbjg1SlVGZGM5RGk3?=
 =?utf-8?B?bXpCUUtQM1dLckI1S1QvNnpNOStRT3RHQnQ5QWpGc3RGb0dOWmt1aEJFNUl5?=
 =?utf-8?B?TjZ1bjc1Nkw4SDBBSHh1NTdwS05GNzVJdFE1cmVVQUhJeGdKcWpWUW5wWGxj?=
 =?utf-8?B?b2l4RUNyY2IySWt1TzVhRjVNck0wcWljSS9CKzVLK0hUQXM5alFDb240eEJU?=
 =?utf-8?B?bXBKdzROWG0wQXcyN0NKTzZaWW1kSGhTWDliUzk5OWZWTGQzODVqdzJPeitq?=
 =?utf-8?B?M1JDTnpMWHV3ZDh6N1ZiNVcwa09DcVJxa2Y1bis4MnBZcGF1Nlh6WWpiMUFu?=
 =?utf-8?B?bTFRZW9xU1FvUGNuczhmdkxZWlFIeHk5c0dPM1BQekZqMmRhTjV0bWFXSzdz?=
 =?utf-8?B?ak9HVG9WZVRSbzEwcmdFZk9QV3ptU25GbzFHNWFrWFlsM2lVR3NOSGJ2dVRL?=
 =?utf-8?B?NElaRUFQNmxab290UWFhR0VheExHMW1kNGRtZVpwM0tTQXpXamExTVJVL2VT?=
 =?utf-8?B?dVkxbi9LdVdCaHhYTlYwMEJyZ2kxdm04NlBUdTduMEd5NzdJNlBwTWZpNmMw?=
 =?utf-8?B?a251eXpEQldYUDdMTmhOY0hxWWNWTkEyMnpEQ0VXQUx2RC9FT002cDRIRHlJ?=
 =?utf-8?B?QVQyc01UQWZqZjYxSEhPMk5vWWd0MDM0aVRxbHE1YlFNeUtDbHlvNGNySXFE?=
 =?utf-8?B?cVFneTFTTU12NklTUGtzRXVibUhyU3ZPT1VibXhVUmw4VGdyWFpoaGRTTU1W?=
 =?utf-8?Q?oNWFHNWBiSqZj7S6JDHr26dng?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 5e9eea1c-54af-433e-3a77-08db4c0c5001
X-MS-Exchange-CrossTenant-AuthSource: SN7PR11MB7420.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2023 19:26:37.1765
 (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: iyQNKJBvJxySflyudnO1bPzuhk1gApUq893PyHtuUiUy0Q4fbLmjolaqGPREPr6vLOJsmlNLOMYKzDI0QZLeTA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4609
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-8.8 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,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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


On 2023-05-02 21:15, Ding Hui wrote:
> If we set channels greater when iavf_remove, the waiting reset done
> will be timeout, then returned with error but changed num_active_queues
> directly, that will lead to OOB like the following logs. Because the
> num_active_queues is greater than tx/rx_rings[] allocated actually.
>
> Reproducer:
>
>    [root@host ~]# cat repro.sh
>    #!/bin/bash
>
>    pf_dbsf="0000:41:00.0"
>    vf0_dbsf="0000:41:02.0"
>    g_pids=()
>
>    function do_set_numvf()
>    {
>        echo 2 >/sys/bus/pci/devices/${pf_dbsf}/sriov_numvfs
>        sleep $((RANDOM%3+1))
>        echo 0 >/sys/bus/pci/devices/${pf_dbsf}/sriov_numvfs
>        sleep $((RANDOM%3+1))
>    }
>
>    function do_set_channel()
>    {
>        local nic=$(ls -1 --indicator-style=none /sys/bus/pci/devices/${vf0_dbsf}/net/)
>        [ -z "$nic" ] && { sleep $((RANDOM%3)) ; return 1; }
>        ifconfig $nic 192.168.18.5 netmask 255.255.255.0
>        ifconfig $nic up
>        ethtool -L $nic combined 1
>        ethtool -L $nic combined 4
>        sleep $((RANDOM%3))
>    }
>
>    function on_exit()
>    {
>        local pid
>        for pid in "${g_pids[@]}"; do
>            kill -0 "$pid" &>/dev/null && kill "$pid" &>/dev/null
>        done
>        g_pids=()
>    }
>
>    trap "on_exit; exit" EXIT
>
>    while :; do do_set_numvf ; done &
>    g_pids+=($!)
>    while :; do do_set_channel ; done &
>    g_pids+=($!)
>
>    wait
>
> Result:
>
> [ 3506.152887] iavf 0000:41:02.0: Removing device
> [ 3510.400799] ==================================================================
> [ 3510.400820] BUG: KASAN: slab-out-of-bounds in iavf_free_all_tx_resources+0x156/0x160 [iavf]
> [ 3510.400823] Read of size 8 at addr ffff88b6f9311008 by task repro.sh/55536
> [ 3510.400823]
> [ 3510.400830] CPU: 101 PID: 55536 Comm: repro.sh Kdump: loaded Tainted: G           O     --------- -t - 4.18.0 #1
> [ 3510.400832] Hardware name: Powerleader PR2008AL/H12DSi-N6, BIOS 2.0 04/09/2021
> [ 3510.400835] Call Trace:
> [ 3510.400851]  dump_stack+0x71/0xab
> [ 3510.400860]  print_address_description+0x6b/0x290
> [ 3510.400865]  ? iavf_free_all_tx_resources+0x156/0x160 [iavf]
> [ 3510.400868]  kasan_report+0x14a/0x2b0
> [ 3510.400873]  iavf_free_all_tx_resources+0x156/0x160 [iavf]
> [ 3510.400880]  iavf_remove+0x2b6/0xc70 [iavf]
> [ 3510.400884]  ? iavf_free_all_rx_resources+0x160/0x160 [iavf]
> [ 3510.400891]  ? wait_woken+0x1d0/0x1d0
> [ 3510.400895]  ? notifier_call_chain+0xc1/0x130
> [ 3510.400903]  pci_device_remove+0xa8/0x1f0
> [ 3510.400910]  device_release_driver_internal+0x1c6/0x460
> [ 3510.400916]  pci_stop_bus_device+0x101/0x150
> [ 3510.400919]  pci_stop_and_remove_bus_device+0xe/0x20
> [ 3510.400924]  pci_iov_remove_virtfn+0x187/0x420
> [ 3510.400927]  ? pci_iov_add_virtfn+0xe10/0xe10
> [ 3510.400929]  ? pci_get_subsys+0x90/0x90
> [ 3510.400932]  sriov_disable+0xed/0x3e0
> [ 3510.400936]  ? bus_find_device+0x12d/0x1a0
> [ 3510.400953]  i40e_free_vfs+0x754/0x1210 [i40e]
> [ 3510.400966]  ? i40e_reset_all_vfs+0x880/0x880 [i40e]
> [ 3510.400968]  ? pci_get_device+0x7c/0x90
> [ 3510.400970]  ? pci_get_subsys+0x90/0x90
> [ 3510.400982]  ? pci_vfs_assigned.part.7+0x144/0x210
> [ 3510.400987]  ? __mutex_lock_slowpath+0x10/0x10
> [ 3510.400996]  i40e_pci_sriov_configure+0x1fa/0x2e0 [i40e]
> [ 3510.401001]  sriov_numvfs_store+0x214/0x290
> [ 3510.401005]  ? sriov_totalvfs_show+0x30/0x30
> [ 3510.401007]  ? __mutex_lock_slowpath+0x10/0x10
> [ 3510.401011]  ? __check_object_size+0x15a/0x350
> [ 3510.401018]  kernfs_fop_write+0x280/0x3f0
> [ 3510.401022]  vfs_write+0x145/0x440
> [ 3510.401025]  ksys_write+0xab/0x160
> [ 3510.401028]  ? __ia32_sys_read+0xb0/0xb0
> [ 3510.401031]  ? fput_many+0x1a/0x120
> [ 3510.401032]  ? filp_close+0xf0/0x130
> [ 3510.401038]  do_syscall_64+0xa0/0x370
> [ 3510.401041]  ? page_fault+0x8/0x30
> [ 3510.401043]  entry_SYSCALL_64_after_hwframe+0x65/0xca
> [ 3510.401073] RIP: 0033:0x7f3a9bb842c0
> [ 3510.401079] Code: 73 01 c3 48 8b 0d d8 cb 2c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 0f 1f 44 00 00 83 3d 89 24 2d 00 00 75 10 b8 01 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 31 c3 48 83 ec 08 e8 fe dd 01 00 48 89 04 24
> [ 3510.401080] RSP: 002b:00007ffc05f1fe18 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
> [ 3510.401083] RAX: ffffffffffffffda RBX: 0000000000000002 RCX: 00007f3a9bb842c0
> [ 3510.401085] RDX: 0000000000000002 RSI: 0000000002327408 RDI: 0000000000000001
> [ 3510.401086] RBP: 0000000002327408 R08: 00007f3a9be53780 R09: 00007f3a9c8a4700
> [ 3510.401086] R10: 0000000000000001 R11: 0000000000000246 R12: 0000000000000002
> [ 3510.401087] R13: 0000000000000001 R14: 00007f3a9be52620 R15: 0000000000000001
> [ 3510.401090]
> [ 3510.401093] Allocated by task 76795:
> [ 3510.401098]  kasan_kmalloc+0xa6/0xd0
> [ 3510.401099]  __kmalloc+0xfb/0x200
> [ 3510.401104]  iavf_init_interrupt_scheme+0x26f/0x1310 [iavf]
> [ 3510.401108]  iavf_watchdog_task+0x1d58/0x4050 [iavf]
> [ 3510.401114]  process_one_work+0x56a/0x11f0
> [ 3510.401115]  worker_thread+0x8f/0xf40
> [ 3510.401117]  kthread+0x2a0/0x390
> [ 3510.401119]  ret_from_fork+0x1f/0x40
> [ 3510.401122]  0xffffffffffffffff
> [ 3510.401123]
>
> If we detected removing is in processing, we can avoid unnecessary
> waiting and return error faster.
>
> On the other hand in timeout handling, we should keep the original
> num_active_queues and reset num_req_queues to 0.
>
> Fixes: 4e5e6b5d9d13 ("iavf: Fix return of set the new channel count")
> Signed-off-by: Ding Hui <dinghui@sangfor.com.cn>
> Cc: Donglin Peng <pengdonglin@sangfor.com.cn>
> Cc: Huang Cun <huangcun@sangfor.com.cn>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>
> ---
> v3 to v4:
>    - nothing changed
>
> v2 to v3:
>    - fix review tag
>
> v1 to v2:
>    - add reproduction script
>
> ---
>   drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
> index 6f171d1d85b7..d8a3c0cfedd0 100644
> --- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
> +++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
> @@ -1857,13 +1857,15 @@ static int iavf_set_channels(struct net_device *netdev,
>   	/* wait for the reset is done */
>   	for (i = 0; i < IAVF_RESET_WAIT_COMPLETE_COUNT; i++) {
>   		msleep(IAVF_RESET_WAIT_MS);
> +		if (test_bit(__IAVF_IN_REMOVE_TASK, &adapter->crit_section))
> +			return -EOPNOTSUPP;
>   		if (adapter->flags & IAVF_FLAG_RESET_PENDING)
>   			continue;
>   		break;
>   	}
>   	if (i == IAVF_RESET_WAIT_COMPLETE_COUNT) {
>   		adapter->flags &= ~IAVF_FLAG_REINIT_ITR_NEEDED;
> -		adapter->num_active_queues = num_req;
> +		adapter->num_req_queues = 0;
>   		return -EOPNOTSUPP;
>   	}
>   


Thanks.

Reviewed-by: Ahmed Zaki <ahmed.zaki@intel.com>