From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751021AbcFVEM4 (ORCPT ); Wed, 22 Jun 2016 00:12:56 -0400 Received: from mx2.suse.de ([195.135.220.15]:38106 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750740AbcFVEMl (ORCPT ); Wed, 22 Jun 2016 00:12:41 -0400 Subject: Re: [PATCH] xen/pciback: Fix conf_space read/write overlap check. To: Boris Ostrovsky , Andrey Grodzovsky , xen-devel@lists.xenproject.org References: <1466519876-7205-1-git-send-email-andrey2805@gmail.com> <576962A2.9080000@oracle.com> Cc: jw@quattru.com, Jan Beulich , stable@vger.kernel.org, David Vrabel , Linux Kernel Mailing List From: Juergen Gross Message-ID: <576A1004.3000301@suse.com> Date: Wed, 22 Jun 2016 06:11:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 MIME-Version: 1.0 In-Reply-To: <576962A2.9080000@oracle.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 21/06/16 17:52, Boris Ostrovsky wrote: > 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 Acked-by: Juergen Gross > > >> --- >> 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: Juergen Gross Subject: Re: [PATCH] xen/pciback: Fix conf_space read/write overlap check. Date: Wed, 22 Jun 2016 06:11:48 +0200 Message-ID: <576A1004.3000301@suse.com> References: <1466519876-7205-1-git-send-email-andrey2805@gmail.com> <576962A2.9080000@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFZW3-0002lp-Ve for xen-devel@lists.xenproject.org; Wed, 22 Jun 2016 04:11:52 +0000 In-Reply-To: <576962A2.9080000@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Boris Ostrovsky , Andrey Grodzovsky , xen-devel@lists.xenproject.org Cc: stable@vger.kernel.org, Linux Kernel Mailing List , Jan Beulich , jw@quattru.com, David Vrabel List-Id: xen-devel@lists.xenproject.org T24gMjEvMDYvMTYgMTc6NTIsIEJvcmlzIE9zdHJvdnNreSB3cm90ZToKPiBPbiAwNi8yMS8yMDE2 IDEwOjM3IEFNLCBBbmRyZXkgR3JvZHpvdnNreSB3cm90ZToKPj4gQ3VycmVudCBvdmVybGFwIGNo ZWNrIGlzIGV2YWx1YXRpbmcgdG8gZmFsc2UgYSBjYXNlIHdoZXJlIGEgZmlsdGVyIGZpZWxkCj4+ IGlzIGZ1bGx5IGNvbnRhaW5lZCAocHJvcGVyIHN1YnNldCkgb2YgYSByL3cgcmVxdWVzdC4KPj4g VGhpcyBjaGFuZ2UgYXBwbGllcyBjbGFzc2ljYWwgb3ZlcmxhcCBjaGVjayBpbnN0ZWFkIHRvIGlu Y2x1ZGUKPj4gYWxsIHRoZSBzY2VuYXJpb3MuCj4+Cj4+IFJlbGF0ZWQgdG8gaHR0cHM6Ly93d3cu bWFpbC1hcmNoaXZlLmNvbS94ZW4tZGV2ZWxAbGlzdHMueGVuLm9yZy9tc2c3MjE3NC5odG1sCj4+ Cj4+IENjOiBKYW4gQmV1bGljaCA8SkJldWxpY2hAc3VzZS5jb20+Cj4+IENjOiBCb3JpcyBPc3Ry b3Zza3kgPGJvcmlzLm9zdHJvdnNreUBvcmFjbGUuY29tPgo+PiBDYzogc3RhYmxlQHZnZXIua2Vy bmVsLm9yZwo+PiBTaWduZWQtb2ZmLWJ5OiBBbmRyZXkgR3JvZHpvdnNreSA8YW5kcmV5MjgwNUBn bWFpbC5jb20+Cj4gCj4gKyBEYXZpZCBhbmQgSnVlcmdlbiAobWFpbnRhaW5lcnMpIGFuZCBrZXJu ZWwgbGlzdC4KPiAKPiBSZXZpZXdlZC1ieTogQm9yaXMgT3N0cm92c2t5IDxib3Jpcy5vc3Ryb3Zz a3lAb3JhY2xlLmNvbT4KCkFja2VkLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+ Cgo+IAo+IAo+PiAtLS0KPj4gIGRyaXZlcnMveGVuL3hlbi1wY2liYWNrL2NvbmZfc3BhY2UuYyB8 IDYgKystLS0tCj4+ICAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9u cygtKQo+Pgo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy94ZW4veGVuLXBjaWJhY2svY29uZl9zcGFj ZS5jIGIvZHJpdmVycy94ZW4veGVuLXBjaWJhY2svY29uZl9zcGFjZS5jCj4+IGluZGV4IDhlNjcz MzYuLjZhMjU1MzMgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMveGVuL3hlbi1wY2liYWNrL2NvbmZf c3BhY2UuYwo+PiArKysgYi9kcml2ZXJzL3hlbi94ZW4tcGNpYmFjay9jb25mX3NwYWNlLmMKPj4g QEAgLTE4Myw4ICsxODMsNyBAQCBpbnQgeGVuX3BjaWJrX2NvbmZpZ19yZWFkKHN0cnVjdCBwY2lf ZGV2ICpkZXYsIGludCBvZmZzZXQsIGludCBzaXplLAo+PiAgCQlmaWVsZF9zdGFydCA9IE9GRlNF VChjZmdfZW50cnkpOwo+PiAgCQlmaWVsZF9lbmQgPSBPRkZTRVQoY2ZnX2VudHJ5KSArIGZpZWxk LT5zaXplOwo+PiAgCj4+IC0JCWlmICgocmVxX3N0YXJ0ID49IGZpZWxkX3N0YXJ0ICYmIHJlcV9z dGFydCA8IGZpZWxkX2VuZCkKPj4gLQkJICAgIHx8IChyZXFfZW5kID4gZmllbGRfc3RhcnQgJiYg cmVxX2VuZCA8PSBmaWVsZF9lbmQpKSB7Cj4+ICsJCSBpZiAocmVxX2VuZCA+IGZpZWxkX3N0YXJ0 ICYmIGZpZWxkX2VuZCA+IHJlcV9zdGFydCkgewo+PiAgCQkJZXJyID0gY29uZl9zcGFjZV9yZWFk KGRldiwgY2ZnX2VudHJ5LCBmaWVsZF9zdGFydCwKPj4gIAkJCQkJICAgICAgJnRtcF92YWwpOwo+ PiAgCQkJaWYgKGVycikKPj4gQEAgLTIzMCw4ICsyMjksNyBAQCBpbnQgeGVuX3BjaWJrX2NvbmZp Z193cml0ZShzdHJ1Y3QgcGNpX2RldiAqZGV2LCBpbnQgb2Zmc2V0LCBpbnQgc2l6ZSwgdTMyIHZh bHVlKQo+PiAgCQlmaWVsZF9zdGFydCA9IE9GRlNFVChjZmdfZW50cnkpOwo+PiAgCQlmaWVsZF9l bmQgPSBPRkZTRVQoY2ZnX2VudHJ5KSArIGZpZWxkLT5zaXplOwo+PiAgCj4+IC0JCWlmICgocmVx X3N0YXJ0ID49IGZpZWxkX3N0YXJ0ICYmIHJlcV9zdGFydCA8IGZpZWxkX2VuZCkKPj4gLQkJICAg IHx8IChyZXFfZW5kID4gZmllbGRfc3RhcnQgJiYgcmVxX2VuZCA8PSBmaWVsZF9lbmQpKSB7Cj4+ ICsJCSBpZiAocmVxX2VuZCA+IGZpZWxkX3N0YXJ0ICYmIGZpZWxkX2VuZCA+IHJlcV9zdGFydCkg ewo+PiAgCQkJdG1wX3ZhbCA9IDA7Cj4+ICAKPj4gIAkJCWVyciA9IHhlbl9wY2lia19jb25maWdf cmVhZChkZXYsIGZpZWxkX3N0YXJ0LAo+IAo+IAo+IAoKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVs QGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==