Skip to content

Commit 02ef871

Browse files
andrey2805David Vrabel
authored andcommitted
xen/pciback: Fix conf_space read/write overlap check.
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. More specifically, for (Hilscher GmbH CIFX 50E-DP(M/S)) device driver the logic is such that the entire confspace is read and written in 4 byte chunks. In this case as an example, CACHE_LINE_SIZE, LATENCY_TIMER and PCI_BIST are arriving together in one call to xen_pcibk_config_write() with offset == 0xc and size == 4. With the exsisting overlap check the LATENCY_TIMER field (offset == 0xd, length == 1) is fully contained in the write request and hence is excluded from write, which is incorrect. Signed-off-by: Andrey Grodzovsky <[email protected]> Reviewed-by: Boris Ostrovsky <[email protected]> Reviewed-by: Jan Beulich <[email protected]> Cc: <[email protected]> Signed-off-by: David Vrabel <[email protected]>
1 parent 1cf3874 commit 02ef871

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/xen/xen-pciback/conf_space.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,7 @@ int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size,
183183
field_start = OFFSET(cfg_entry);
184184
field_end = OFFSET(cfg_entry) + field->size;
185185

186-
if ((req_start >= field_start && req_start < field_end)
187-
|| (req_end > field_start && req_end <= field_end)) {
186+
if (req_end > field_start && field_end > req_start) {
188187
err = conf_space_read(dev, cfg_entry, field_start,
189188
&tmp_val);
190189
if (err)
@@ -230,8 +229,7 @@ int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value)
230229
field_start = OFFSET(cfg_entry);
231230
field_end = OFFSET(cfg_entry) + field->size;
232231

233-
if ((req_start >= field_start && req_start < field_end)
234-
|| (req_end > field_start && req_end <= field_end)) {
232+
if (req_end > field_start && field_end > req_start) {
235233
tmp_val = 0;
236234

237235
err = xen_pcibk_config_read(dev, field_start,

0 commit comments

Comments
 (0)