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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 B8649C433E6 for ; Tue, 16 Feb 2021 13:57:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 81AAC64DF0 for ; Tue, 16 Feb 2021 13:57:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230131AbhBPN4s (ORCPT ); Tue, 16 Feb 2021 08:56:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39456 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229924AbhBPN4p (ORCPT ); Tue, 16 Feb 2021 08:56:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613483716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=0W8giq2Q1DKeMph1DuXghSpcsbMciexD+BiqrMJ7xtw=; b=fwt3zsp7WkvzwB/TX95r4F/QG7UDtmGFqsOPgXII+z+65sBV3nK3rSdSqf3FXFKzkK/9NQ iv0xrHhf9ejjAtE7yofv/uDtiJrGcjXDmLyfgY0m8lVUV0ws5oMOaLdKI19h43sHEJLTk1 3enY3Rt9xAhrJCrx4u4NpuqvCzRk+FE= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-458-GUcWebYFMm6BS0jvV44_Jw-1; Tue, 16 Feb 2021 08:55:14 -0500 X-MC-Unique: GUcWebYFMm6BS0jvV44_Jw-1 Received: by mail-wm1-f69.google.com with SMTP id j204so11154188wmj.4 for ; Tue, 16 Feb 2021 05:55:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=0W8giq2Q1DKeMph1DuXghSpcsbMciexD+BiqrMJ7xtw=; b=orwO7ssTB2BOWlnFe6OCbQoCdN88k04wy8lS2KDbkDOqwcfAsOx0mXBE595b0mmxSs zIjEzah4mX6qU3tSRVfDQBLWP9KDXhbX+OLfoPv81Bcd+WSA2OD9mCLOOrxJgo/6UNn4 0dVbmBP0W+4gT4aykpW/4KBDMuKF6WmgBOib9kY8H1b6JITUruTqm3hio4TqO878y14d /yFhhLZ6wKUkG1kJouOHgp4hQirJ6P35USth0AOWVP6s1CYykeG96I2KMgvehz3yEjRT ZgMShaLDfSg4bo4xONANMLwbZ8xriRaSjncFm3IlKRNW23KFFNUP4XrQfC5WVBjT7Oyx LklA== X-Gm-Message-State: AOAM530iq9/hnW1zLSg0+CuOn4NHjlj+PlJ3inyJ6jrQSROkC1TRe25e vUX5PHgdEDLxXqZA0A+PreEKm/JhRpmvz5+kTMh9KxLqyILpi4bbNsFxFdyz3170ZC73k1erPVZ 3GZTdx53XGoitTn0w5NlHF2Oq X-Received: by 2002:adf:f389:: with SMTP id m9mr24534236wro.406.1613483713334; Tue, 16 Feb 2021 05:55:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJyTlzjWj7/PtXUmKJvMwpggEpwB25ri5EWofa4TwaZHgxK4n/IjY5wK5PIXju4uJwrrjZ3U4Q== X-Received: by 2002:adf:f389:: with SMTP id m9mr24534210wro.406.1613483713029; Tue, 16 Feb 2021 05:55:13 -0800 (PST) Received: from steredhat (host-79-34-249-199.business.telecomitalia.it. [79.34.249.199]) by smtp.gmail.com with ESMTPSA id u10sm3565308wmj.40.2021.02.16.05.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Feb 2021 05:55:12 -0800 (PST) Date: Tue, 16 Feb 2021 14:55:09 +0100 From: Stefano Garzarella To: Greg KH Cc: stable@vger.kernel.org, Jason Wang , virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Eli Cohen , "Michael S. Tsirkin" Subject: Re: [PATCH for 5.10] vdpa_sim: fix param validation in vdpasim_get_config() Message-ID: <20210216135509.46cstmwwobizrjfo@steredhat> References: <20210211162519.215418-1-sgarzare@redhat.com> <20210215150321.anwcogkifg6sefp6@steredhat> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 15, 2021 at 04:23:54PM +0100, Greg KH wrote: >On Mon, Feb 15, 2021 at 04:03:21PM +0100, Stefano Garzarella wrote: >> On Mon, Feb 15, 2021 at 03:32:19PM +0100, Greg KH wrote: >> > On Thu, Feb 11, 2021 at 05:25:19PM +0100, Stefano Garzarella wrote: >> > > Commit 65b709586e222fa6ffd4166ac7fdb5d5dad113ee upstream. >> > >> > No, this really is not that commit, so please do not say it is. >> >> Oops, sorry. >> >> > >> > > Before this patch, if 'offset + len' was equal to >> > > sizeof(struct virtio_net_config), the entire buffer wasn't filled, >> > > returning incorrect values to the caller. >> > > >> > > Since 'vdpasim->config' type is 'struct virtio_net_config', we can >> > > safely copy its content under this condition. >> > > >> > > Commit 65b709586e22 ("vdpa_sim: add get_config callback in >> > > vdpasim_dev_attr") unintentionally solved it upstream while >> > > refactoring vdpa_sim.c to support multiple devices. But we don't want >> > > to backport it to stable branches as it contains many changes. >> > > >> > > Fixes: 2c53d0f64c06 ("vdpasim: vDPA device simulator") >> > > Cc: # 5.10.x >> > > Signed-off-by: Stefano Garzarella >> > > --- >> > > drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 +- >> > > 1 file changed, 1 insertion(+), 1 deletion(-) >> > > >> > > diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c >> > > index 6a90fdb9cbfc..8ca178d7b02f 100644 >> > > --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c >> > > +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c >> > > @@ -572,7 +572,7 @@ static void vdpasim_get_config(struct vdpa_device *vdpa, unsigned int offset, >> > > { >> > > struct vdpasim *vdpasim = vdpa_to_sim(vdpa); >> > > >> > > - if (offset + len < sizeof(struct virtio_net_config)) >> > > + if (offset + len <= sizeof(struct virtio_net_config)) >> > > memcpy(buf, (u8 *)&vdpasim->config + offset, len); >> > > } >> > >> > I'll be glad to take a one-off patch, but why can't we take the real >> > upstream patch? That is always the better long-term solution, right? >> >> Because that patch depends on the following patches merged in v5.11-rc1 >> while refactoring vdpa_sim: >> f37cbbc65178 vdpa_sim: make 'config' generic and usable for any device type >> cf1a3b35382c vdpa_sim: store parsed MAC address in a buffer >> a13b5918fdd0 vdpa_sim: add work_fn in vdpasim_dev_attr >> 011c35bac5ef vdpa_sim: add supported_features field in vdpasim_dev_attr >> 2f8f46188805 vdpa_sim: add device id field in vdpasim_dev_attr >> 6c6e28fe4579 vdpa_sim: add struct vdpasim_dev_attr for device attributes >> 36a9c3063025 vdpa_sim: rename vdpasim_config_ops variables >> 423248d60d2b vdpa_sim: remove hard-coded virtq count >> >> Maybe we can skip some of them, but IMHO should be less risky to apply only >> this change. >> >> If you want I can try to figure out the minimum sub-set of patches needed >> for 65b709586e22 ("vdpa_sim: add get_config callback in vdpasim_dev_attr"). > >The minimum is always nice :) > The minimum set, including the patch that fixes the issue, is the following: 65b709586e22 vdpa_sim: add get_config callback in vdpasim_dev_attr f37cbbc65178 vdpa_sim: make 'config' generic and usable for any device type cf1a3b35382c vdpa_sim: store parsed MAC address in a buffer 6c6e28fe4579 vdpa_sim: add struct vdpasim_dev_attr for device attributes 423248d60d2b vdpa_sim: remove hard-coded virtq count The patches apply fairly cleanly. There are a few contextual differences due to the lack of the other patches: $ git backport-diff -u master -r linux-5.10.y..HEAD Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively 001/5:[----] [--] 'vdpa_sim: remove hard-coded virtq count' 002/5:[----] [-C] 'vdpa_sim: add struct vdpasim_dev_attr for device attributes' 003/5:[----] [--] 'vdpa_sim: store parsed MAC address in a buffer' 004/5:[----] [-C] 'vdpa_sim: make 'config' generic and usable for any device type' 005/5:[----] [-C] 'vdpa_sim: add get_config callback in vdpasim_dev_attr' >If it's just too much churn for no good reason, then yes, the one-line >change above will be ok, but you need to document the heck out of why >this is not upstream and that it is a one-off thing. > Shortly I'll send the series to stable@vger.kernel.org so you can judge if it's okay or better to resend this patch with a better description. Thanks Stefano