From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752131AbcFUPyH (ORCPT ); Tue, 21 Jun 2016 11:54:07 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:26611 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750707AbcFUPyD convert rfc822-to-8bit (ORCPT ); Tue, 21 Jun 2016 11:54:03 -0400 Subject: Re: [PATCH] xen/pciback: Fix conf_space read/write overlap check. To: Andrey Grodzovsky , xen-devel@lists.xenproject.org References: <1466519876-7205-1-git-send-email-andrey2805@gmail.com> Cc: jw@quattru.com, Jan Beulich , stable@vger.kernel.org, David Vrabel , Juergen Gross , Linux Kernel Mailing List From: Boris Ostrovsky Message-ID: <576962A2.9080000@oracle.com> Date: Tue, 21 Jun 2016 11:52:02 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 In-Reply-To: <1466519876-7205-1-git-send-email-andrey2805@gmail.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8BIT X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/21/2016 10:37 AM, Andrey Grodzovsky wrote: > Current overlap check is evaluating to false a case where a filter field > is fully contained (proper subset) of a r/w request. > This change applies classical overlap check instead to include > all the scenarios. > > Related to https://www.mail-archive.com/xen-devel@lists.xen.org/msg72174.html > > Cc: Jan Beulich > Cc: Boris Ostrovsky > Cc: stable@vger.kernel.org > Signed-off-by: Andrey Grodzovsky + David and Juergen (maintainers) and kernel list. Reviewed-by: Boris Ostrovsky > --- > drivers/xen/xen-pciback/conf_space.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/xen/xen-pciback/conf_space.c b/drivers/xen/xen-pciback/conf_space.c > index 8e67336..6a25533 100644 > --- a/drivers/xen/xen-pciback/conf_space.c > +++ b/drivers/xen/xen-pciback/conf_space.c > @@ -183,8 +183,7 @@ int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size, > field_start = OFFSET(cfg_entry); > field_end = OFFSET(cfg_entry) + field->size; > > - if ((req_start >= field_start && req_start < field_end) > - || (req_end > field_start && req_end <= field_end)) { > + if (req_end > field_start && field_end > req_start) { > err = conf_space_read(dev, cfg_entry, field_start, > &tmp_val); > if (err) > @@ -230,8 +229,7 @@ int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value) > field_start = OFFSET(cfg_entry); > field_end = OFFSET(cfg_entry) + field->size; > > - if ((req_start >= field_start && req_start < field_end) > - || (req_end > field_start && req_end <= field_end)) { > + if (req_end > field_start && field_end > req_start) { > tmp_val = 0; > > err = xen_pcibk_config_read(dev, field_start, From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Ostrovsky Subject: Re: [PATCH] xen/pciback: Fix conf_space read/write overlap check. Date: Tue, 21 Jun 2016 11:52:02 -0400 Message-ID: <576962A2.9080000@oracle.com> References: <1466519876-7205-1-git-send-email-andrey2805@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFNyM-0003e3-Bw for xen-devel@lists.xenproject.org; Tue, 21 Jun 2016 15:52:18 +0000 In-Reply-To: <1466519876-7205-1-git-send-email-andrey2805@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Andrey Grodzovsky , xen-devel@lists.xenproject.org Cc: Juergen Gross , jw@quattru.com, Linux Kernel Mailing List , stable@vger.kernel.org, David Vrabel , Jan Beulich List-Id: xen-devel@lists.xenproject.org T24gMDYvMjEvMjAxNiAxMDozNyBBTSwgQW5kcmV5IEdyb2R6b3Zza3kgd3JvdGU6Cj4gQ3VycmVu dCBvdmVybGFwIGNoZWNrIGlzIGV2YWx1YXRpbmcgdG8gZmFsc2UgYSBjYXNlIHdoZXJlIGEgZmls dGVyIGZpZWxkCj4gaXMgZnVsbHkgY29udGFpbmVkIChwcm9wZXIgc3Vic2V0KSBvZiBhIHIvdyBy ZXF1ZXN0Lgo+IFRoaXMgY2hhbmdlIGFwcGxpZXMgY2xhc3NpY2FsIG92ZXJsYXAgY2hlY2sgaW5z dGVhZCB0byBpbmNsdWRlCj4gYWxsIHRoZSBzY2VuYXJpb3MuCj4KPiBSZWxhdGVkIHRvIGh0dHBz Oi8vd3d3Lm1haWwtYXJjaGl2ZS5jb20veGVuLWRldmVsQGxpc3RzLnhlbi5vcmcvbXNnNzIxNzQu aHRtbAo+Cj4gQ2M6IEphbiBCZXVsaWNoIDxKQmV1bGljaEBzdXNlLmNvbT4KPiBDYzogQm9yaXMg T3N0cm92c2t5IDxib3Jpcy5vc3Ryb3Zza3lAb3JhY2xlLmNvbT4KPiBDYzogc3RhYmxlQHZnZXIu a2VybmVsLm9yZwo+IFNpZ25lZC1vZmYtYnk6IEFuZHJleSBHcm9kem92c2t5IDxhbmRyZXkyODA1 QGdtYWlsLmNvbT4KCisgRGF2aWQgYW5kIEp1ZXJnZW4gKG1haW50YWluZXJzKSBhbmQga2VybmVs IGxpc3QuCgpSZXZpZXdlZC1ieTogQm9yaXMgT3N0cm92c2t5IDxib3Jpcy5vc3Ryb3Zza3lAb3Jh Y2xlLmNvbT4KCgo+IC0tLQo+ICBkcml2ZXJzL3hlbi94ZW4tcGNpYmFjay9jb25mX3NwYWNlLmMg fCA2ICsrLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9u cygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMveGVuL3hlbi1wY2liYWNrL2NvbmZfc3BhY2Uu YyBiL2RyaXZlcnMveGVuL3hlbi1wY2liYWNrL2NvbmZfc3BhY2UuYwo+IGluZGV4IDhlNjczMzYu LjZhMjU1MzMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy94ZW4veGVuLXBjaWJhY2svY29uZl9zcGFj ZS5jCj4gKysrIGIvZHJpdmVycy94ZW4veGVuLXBjaWJhY2svY29uZl9zcGFjZS5jCj4gQEAgLTE4 Myw4ICsxODMsNyBAQCBpbnQgeGVuX3BjaWJrX2NvbmZpZ19yZWFkKHN0cnVjdCBwY2lfZGV2ICpk ZXYsIGludCBvZmZzZXQsIGludCBzaXplLAo+ICAJCWZpZWxkX3N0YXJ0ID0gT0ZGU0VUKGNmZ19l bnRyeSk7Cj4gIAkJZmllbGRfZW5kID0gT0ZGU0VUKGNmZ19lbnRyeSkgKyBmaWVsZC0+c2l6ZTsK PiAgCj4gLQkJaWYgKChyZXFfc3RhcnQgPj0gZmllbGRfc3RhcnQgJiYgcmVxX3N0YXJ0IDwgZmll bGRfZW5kKQo+IC0JCSAgICB8fCAocmVxX2VuZCA+IGZpZWxkX3N0YXJ0ICYmIHJlcV9lbmQgPD0g ZmllbGRfZW5kKSkgewo+ICsJCSBpZiAocmVxX2VuZCA+IGZpZWxkX3N0YXJ0ICYmIGZpZWxkX2Vu ZCA+IHJlcV9zdGFydCkgewo+ICAJCQllcnIgPSBjb25mX3NwYWNlX3JlYWQoZGV2LCBjZmdfZW50 cnksIGZpZWxkX3N0YXJ0LAo+ICAJCQkJCSAgICAgICZ0bXBfdmFsKTsKPiAgCQkJaWYgKGVycikK PiBAQCAtMjMwLDggKzIyOSw3IEBAIGludCB4ZW5fcGNpYmtfY29uZmlnX3dyaXRlKHN0cnVjdCBw Y2lfZGV2ICpkZXYsIGludCBvZmZzZXQsIGludCBzaXplLCB1MzIgdmFsdWUpCj4gIAkJZmllbGRf c3RhcnQgPSBPRkZTRVQoY2ZnX2VudHJ5KTsKPiAgCQlmaWVsZF9lbmQgPSBPRkZTRVQoY2ZnX2Vu dHJ5KSArIGZpZWxkLT5zaXplOwo+ICAKPiAtCQlpZiAoKHJlcV9zdGFydCA+PSBmaWVsZF9zdGFy dCAmJiByZXFfc3RhcnQgPCBmaWVsZF9lbmQpCj4gLQkJICAgIHx8IChyZXFfZW5kID4gZmllbGRf c3RhcnQgJiYgcmVxX2VuZCA8PSBmaWVsZF9lbmQpKSB7Cj4gKwkJIGlmIChyZXFfZW5kID4gZmll bGRfc3RhcnQgJiYgZmllbGRfZW5kID4gcmVxX3N0YXJ0KSB7Cj4gIAkJCXRtcF92YWwgPSAwOwo+ ICAKPiAgCQkJZXJyID0geGVuX3BjaWJrX2NvbmZpZ19yZWFkKGRldiwgZmllbGRfc3RhcnQsCgoK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZl bCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5v cmcveGVuLWRldmVsCg==