diff mbox

PCI: Fix typo in pax_open/close_kernel wrapping

Message ID 20170301203349.GA42365@beast (mailing list archive)
State New, archived
Headers show

Commit Message

Kees Cook March 1, 2017, 8:33 p.m. UTC
This fixes a mistaken double-open in PaX's constification coverage of
cpcihp_zt5550.

Signed-off-by: Kees Cook <kees@outflux.net>
---
 drivers/pci/hotplug/cpcihp_zt5550.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

pageexec@freemail.hu March 1, 2017, 9:45 p.m. UTC | #1
On 1 Mar 2017 at 12:33, Kees Cook wrote:

> This fixes a mistaken double-open in PaX's constification coverage of
> cpcihp_zt5550.

patch complains with:

 checking file drivers/pci/hotplug/cpcihp_zt5550.c
 Reversed (or previously applied) patch detected!  Assume -R? [n]

are you sure you're looking at a recent tree?
Kees Cook March 1, 2017, 10:46 p.m. UTC | #2
On Wed, Mar 1, 2017 at 1:45 PM, PaX Team <pageexec@freemail.hu> wrote:
> On 1 Mar 2017 at 12:33, Kees Cook wrote:
>
>> This fixes a mistaken double-open in PaX's constification coverage of
>> cpcihp_zt5550.
>
> patch complains with:
>
>  checking file drivers/pci/hotplug/cpcihp_zt5550.c
>  Reversed (or previously applied) patch detected!  Assume -R? [n]
>
> are you sure you're looking at a recent tree?

I guess not! Sorry for the noise. This was from pax-linux-4.9.9-test3.patch.

-Kees
Kees Cook March 1, 2017, 10:58 p.m. UTC | #3
On Wed, Mar 1, 2017 at 2:46 PM, Kees Cook <keescook@chromium.org> wrote:
> On Wed, Mar 1, 2017 at 1:45 PM, PaX Team <pageexec@freemail.hu> wrote:
>> On 1 Mar 2017 at 12:33, Kees Cook wrote:
>>
>>> This fixes a mistaken double-open in PaX's constification coverage of
>>> cpcihp_zt5550.
>>
>> patch complains with:
>>
>>  checking file drivers/pci/hotplug/cpcihp_zt5550.c
>>  Reversed (or previously applied) patch detected!  Assume -R? [n]
>>
>> are you sure you're looking at a recent tree?
>
> I guess not! Sorry for the noise. This was from pax-linux-4.9.9-test3.patch.

Actually, it looks like it's an error in the grsecurity merge of PaX.
The mistake is present in the current grsecurity testing patch:
https://grsecurity.net/test/grsecurity-3.1-4.9.13-201702270729.patch

-Kees
pageexec@freemail.hu March 1, 2017, 11:14 p.m. UTC | #4
On 1 Mar 2017 at 14:58, Kees Cook wrote:

> >> are you sure you're looking at a recent tree?
> >
> > I guess not! Sorry for the noise. This was from pax-linux-4.9.9-test3.patch.
> 
> Actually, it looks like it's an error in the grsecurity merge of PaX.
> The mistake is present in the current grsecurity testing patch:
> https://grsecurity.net/test/grsecurity-3.1-4.9.13-201702270729.patch

he doesn't take such low priority fixes immediately (i found this regression
myself only a few days ago during the 4.10 port) but collects a few more of
them before making a new release.
diff mbox

Patch

diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
index 438f019..18c4d10 100644
--- a/drivers/pci/hotplug/cpcihp_zt5550.c
+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
@@ -228,7 +228,7 @@  static int zt5550_hc_init_one(struct pci_dev *pdev, const struct pci_device_id *
 		const_cast(zt5550_hpc_ops.enable_irq) = zt5550_hc_enable_irq;
 		const_cast(zt5550_hpc_ops.disable_irq) = zt5550_hc_disable_irq;
 		const_cast(zt5550_hpc_ops.check_irq) = zt5550_hc_check_irq;
-		pax_open_kernel();
+		pax_close_kernel();
 	} else {
 		info("using ENUM# polling mode");
 	}