From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACAA5C352A3 for ; Mon, 10 Feb 2020 13:14:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7460620714 for ; Mon, 10 Feb 2020 13:14:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581340489; bh=FKv/ghy2biD146H3NV7opmkiC50/3oFRJmG39cpgdm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yRz23X39cj9P941Ry+D30x1mAzCBnbUvp1ZZrMd2YHiJwhnAiGW6Y8weUTe9fKMkW BE6kIN45H+pHJufsysKoiuU75Dq5tyBWoe4EnPCW4sGyzhL9BMw5cfGr1DHauSGEh3 vjcV7xaNeSHJdFkIa6QQT9XDxzR2x9RdFD5z6rVE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730938AbgBJNOr (ORCPT ); Mon, 10 Feb 2020 08:14:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:34024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729144AbgBJMia (ORCPT ); Mon, 10 Feb 2020 07:38:30 -0500 Received: from localhost (unknown [209.37.97.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 218A820838; Mon, 10 Feb 2020 12:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338310; bh=FKv/ghy2biD146H3NV7opmkiC50/3oFRJmG39cpgdm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MjPyN6BRJsLsOVw03/jgbe9WM4kF1DCVt8v0TfJNHpSQM8RxcIR5Y+dFCC/wzeVaG dTugOQe4BW7//SlFwyndhAk46SHZj4868o+ckK+2EcAfJQaPIUHEYDSWmsvT8QXmLH sU97H1bU5xMLynxKszpUAQDNJMrsNqMTA3QMCQVk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Cornelia Huck , Daniel Verkamp , "Michael S. Tsirkin" Subject: [PATCH 5.4 232/309] virtio-balloon: initialize all vq callbacks Date: Mon, 10 Feb 2020 04:33:08 -0800 Message-Id: <20200210122428.810778179@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122406.106356946@linuxfoundation.org> References: <20200210122406.106356946@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Verkamp commit 5790b53390e18fdd21e70776e46d058c05eda2f2 upstream. Ensure that elements of the callbacks array that correspond to unavailable features are set to NULL; previously, they would be left uninitialized. Since the corresponding names array elements were explicitly set to NULL, the uninitialized callback pointers would not actually be dereferenced; however, the uninitialized callbacks elements would still be read in vp_find_vqs_msix() and used to calculate the number of MSI-X vectors required. Cc: stable@vger.kernel.org Fixes: 86a559787e6f ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT") Reviewed-by: Cornelia Huck Signed-off-by: Daniel Verkamp Signed-off-by: Michael S. Tsirkin Signed-off-by: Greg Kroah-Hartman --- drivers/virtio/virtio_balloon.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -474,7 +474,9 @@ static int init_vqs(struct virtio_balloo names[VIRTIO_BALLOON_VQ_INFLATE] = "inflate"; callbacks[VIRTIO_BALLOON_VQ_DEFLATE] = balloon_ack; names[VIRTIO_BALLOON_VQ_DEFLATE] = "deflate"; + callbacks[VIRTIO_BALLOON_VQ_STATS] = NULL; names[VIRTIO_BALLOON_VQ_STATS] = NULL; + callbacks[VIRTIO_BALLOON_VQ_FREE_PAGE] = NULL; names[VIRTIO_BALLOON_VQ_FREE_PAGE] = NULL; if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_STATS_VQ)) {