Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1281269 > unrolled thread

Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap

Started byGreg KH <gregkh@linuxfoundation.org>
First post2015-12-01 23:40 +0100
Last post2015-12-04 18:00 +0100
Articles 9 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Greg KH <gregkh@linuxfoundation.org> - 2015-12-01 23:40 +0100
    Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar <saurabh.truth@gmail.com> - 2015-12-02 04:40 +0100
      Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Greg KH <gregkh@linuxfoundation.org> - 2015-12-02 16:50 +0100
        Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar <saurabh.truth@gmail.com> - 2015-12-02 17:00 +0100
          Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Greg KH <gregkh@linuxfoundation.org> - 2015-12-02 17:30 +0100
            [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar <saurabh.truth@gmail.com> - 2015-12-02 18:30 +0100
              Re: [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding  iounmap Greg KH <gregkh@linuxfoundation.org> - 2015-12-04 17:30 +0100
                Re: [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar <saurabh.truth@gmail.com> - 2015-12-04 17:40 +0100
                [PATCH v3] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar <saurabh.truth@gmail.com> - 2015-12-04 18:00 +0100

#1281269 — Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap

FromGreg KH <gregkh@linuxfoundation.org>
Date2015-12-01 23:40 +0100
SubjectRe: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap
Message-ID<qB1Ky-7cT-15@gated-at.bofh.it>
On Fri, Nov 06, 2015 at 05:46:30PM +0530, Saurabh Sengar wrote:
> added iounmap inorder to free memory mapped to base before returning
> 
> Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
> ---
>  drivers/usb/host/pci-quirks.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
> index f940056..332f687 100644
> --- a/drivers/usb/host/pci-quirks.c
> +++ b/drivers/usb/host/pci-quirks.c
> @@ -990,7 +990,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
>  			/* We're reading garbage from the controller */
>  			dev_warn(&pdev->dev,
>  				 "xHCI controller failing to respond");
> -			return;
> +			goto iounmap;
>  		}
>  
>  		if (!ext_cap_offset)
> @@ -1061,7 +1061,7 @@ hc_init:
>  			 "xHCI HW did not halt within %d usec status = 0x%x\n",
>  			 XHCI_MAX_HALT_USEC, val);
>  	}
> -
> +iounmap:
>  	iounmap(base);
>  }
>  

Does not apply to the tree :(
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1281434

FromSaurabh Sengar <saurabh.truth@gmail.com>
Date2015-12-02 04:40 +0100
Message-ID<qB6qS-1LU-3@gated-at.bofh.it>
In reply to#1281269
On 2 December 2015 at 04:05, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Fri, Nov 06, 2015 at 05:46:30PM +0530, Saurabh Sengar wrote:
>> added iounmap inorder to free memory mapped to base before returning
>>
>> Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
>> ---
>>  drivers/usb/host/pci-quirks.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
>> index f940056..332f687 100644
>> --- a/drivers/usb/host/pci-quirks.c
>> +++ b/drivers/usb/host/pci-quirks.c
>> @@ -990,7 +990,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
>>                       /* We're reading garbage from the controller */
>>                       dev_warn(&pdev->dev,
>>                                "xHCI controller failing to respond");
>> -                     return;
>> +                     goto iounmap;
>>               }
>>
>>               if (!ext_cap_offset)
>> @@ -1061,7 +1061,7 @@ hc_init:
>>                        "xHCI HW did not halt within %d usec status = 0x%x\n",
>>                        XHCI_MAX_HALT_USEC, val);
>>       }
>> -
>> +iounmap:
>>       iounmap(base);
>>  }
>>
>
> Does not apply to the tree :(


This patch applies fine on top of
"git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git".
Just now only I have re-verified.
Am I expected to send this patch on top of some other git tree/branch ?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1281930

FromGreg KH <gregkh@linuxfoundation.org>
Date2015-12-02 16:50 +0100
Message-ID<qBhPk-FC-33@gated-at.bofh.it>
In reply to#1281434
On Wed, Dec 02, 2015 at 09:08:06AM +0530, Saurabh Sengar wrote:
> On 2 December 2015 at 04:05, Greg KH <gregkh@linuxfoundation.org> wrote:
> > On Fri, Nov 06, 2015 at 05:46:30PM +0530, Saurabh Sengar wrote:
> >> added iounmap inorder to free memory mapped to base before returning
> >>
> >> Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
> >> ---
> >>  drivers/usb/host/pci-quirks.c | 4 ++--
> >>  1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
> >> index f940056..332f687 100644
> >> --- a/drivers/usb/host/pci-quirks.c
> >> +++ b/drivers/usb/host/pci-quirks.c
> >> @@ -990,7 +990,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
> >>                       /* We're reading garbage from the controller */
> >>                       dev_warn(&pdev->dev,
> >>                                "xHCI controller failing to respond");
> >> -                     return;
> >> +                     goto iounmap;
> >>               }
> >>
> >>               if (!ext_cap_offset)
> >> @@ -1061,7 +1061,7 @@ hc_init:
> >>                        "xHCI HW did not halt within %d usec status = 0x%x\n",
> >>                        XHCI_MAX_HALT_USEC, val);
> >>       }
> >> -
> >> +iounmap:
> >>       iounmap(base);
> >>  }
> >>
> >
> > Does not apply to the tree :(
> 
> 
> This patch applies fine on top of
> "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git".
> Just now only I have re-verified.
> Am I expected to send this patch on top of some other git tree/branch ?

It will end up going in the usb.git tree, on the usb-next branch, and it
conflicts with other xhci patches that just landed there ahead of yours.
So it's not your fault, you did the right thing, just others also did
work here so you need to redo yours as well, a normal thing in kernel
development :)

hope this helps explain things.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1281944

FromSaurabh Sengar <saurabh.truth@gmail.com>
Date2015-12-02 17:00 +0100
Message-ID<qBhZ0-Jp-11@gated-at.bofh.it>
In reply to#1281930
Hi Greg,

I am little unclear.
Now, shall I resend my patch on top of usb.git tree or linux.git tree.

Regards,
Saurabh

On 2 December 2015 at 21:15, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Wed, Dec 02, 2015 at 09:08:06AM +0530, Saurabh Sengar wrote:
>> On 2 December 2015 at 04:05, Greg KH <gregkh@linuxfoundation.org> wrote:
>> > On Fri, Nov 06, 2015 at 05:46:30PM +0530, Saurabh Sengar wrote:
>> >> added iounmap inorder to free memory mapped to base before returning
>> >>
>> >> Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
>> >> ---
>> >>  drivers/usb/host/pci-quirks.c | 4 ++--
>> >>  1 file changed, 2 insertions(+), 2 deletions(-)
>> >>
>> >> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
>> >> index f940056..332f687 100644
>> >> --- a/drivers/usb/host/pci-quirks.c
>> >> +++ b/drivers/usb/host/pci-quirks.c
>> >> @@ -990,7 +990,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
>> >>                       /* We're reading garbage from the controller */
>> >>                       dev_warn(&pdev->dev,
>> >>                                "xHCI controller failing to respond");
>> >> -                     return;
>> >> +                     goto iounmap;
>> >>               }
>> >>
>> >>               if (!ext_cap_offset)
>> >> @@ -1061,7 +1061,7 @@ hc_init:
>> >>                        "xHCI HW did not halt within %d usec status = 0x%x\n",
>> >>                        XHCI_MAX_HALT_USEC, val);
>> >>       }
>> >> -
>> >> +iounmap:
>> >>       iounmap(base);
>> >>  }
>> >>
>> >
>> > Does not apply to the tree :(
>>
>>
>> This patch applies fine on top of
>> "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git".
>> Just now only I have re-verified.
>> Am I expected to send this patch on top of some other git tree/branch ?
>
> It will end up going in the usb.git tree, on the usb-next branch, and it
> conflicts with other xhci patches that just landed there ahead of yours.
> So it's not your fault, you did the right thing, just others also did
> work here so you need to redo yours as well, a normal thing in kernel
> development :)
>
> hope this helps explain things.
>
> thanks,
>
> greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1281974

FromGreg KH <gregkh@linuxfoundation.org>
Date2015-12-02 17:30 +0100
Message-ID<qBis3-19N-21@gated-at.bofh.it>
In reply to#1281944
On Wed, Dec 02, 2015 at 09:25:53PM +0530, Saurabh Sengar wrote:
> Hi Greg,
> 
> I am little unclear.
> Now, shall I resend my patch on top of usb.git tree or linux.git tree.

The usb-next branch of the usb.git tree please.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1282106 — [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap

FromSaurabh Sengar <saurabh.truth@gmail.com>
Date2015-12-02 18:30 +0100
Subject[PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap
Message-ID<qBjo7-1O1-33@gated-at.bofh.it>
In reply to#1281974
added iounmap inorder to free memory mapped to base before returning

Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
---
v2: changed logic a bit, because of recent patches pushed to usb-next
 drivers/usb/host/pci-quirks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 26cb8c8..2ac198c 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -992,7 +992,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
 	if ((ext_cap_offset + sizeof(val)) > len) {
 		/* We're reading garbage from the controller */
 		dev_warn(&pdev->dev, "xHCI controller failing to respond");
-		return;
+		goto hc_init;
 	}
 	val = readl(base + ext_cap_offset);
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1283990 — Re: [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap

FromGreg KH <gregkh@linuxfoundation.org>
Date2015-12-04 17:30 +0100
SubjectRe: [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap
Message-ID<qC1pa-54b-71@gated-at.bofh.it>
In reply to#1282106
On Wed, Dec 02, 2015 at 10:51:37PM +0530, Saurabh Sengar wrote:
> added iounmap inorder to free memory mapped to base before returning
> 
> Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
> ---
> v2: changed logic a bit, because of recent patches pushed to usb-next
>  drivers/usb/host/pci-quirks.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
> index 26cb8c8..2ac198c 100644
> --- a/drivers/usb/host/pci-quirks.c
> +++ b/drivers/usb/host/pci-quirks.c
> @@ -992,7 +992,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
>  	if ((ext_cap_offset + sizeof(val)) > len) {
>  		/* We're reading garbage from the controller */
>  		dev_warn(&pdev->dev, "xHCI controller failing to respond");
> -		return;
> +		goto hc_init;

Are you sure this is correct?  That goto location then does a whole
bunch of things with the xhci controller that you just now determined is
failing to respond.  I can't take this as-is, sorry.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1283998 — Re: [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap

FromSaurabh Sengar <saurabh.truth@gmail.com>
Date2015-12-04 17:40 +0100
SubjectRe: [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap
Message-ID<qC1yO-57z-23@gated-at.bofh.it>
In reply to#1283990
On 4 December 2015 at 21:53, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Wed, Dec 02, 2015 at 10:51:37PM +0530, Saurabh Sengar wrote:
>> added iounmap inorder to free memory mapped to base before returning
>>
>> Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
>> ---
>> v2: changed logic a bit, because of recent patches pushed to usb-next
>>  drivers/usb/host/pci-quirks.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
>> index 26cb8c8..2ac198c 100644
>> --- a/drivers/usb/host/pci-quirks.c
>> +++ b/drivers/usb/host/pci-quirks.c
>> @@ -992,7 +992,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
>>       if ((ext_cap_offset + sizeof(val)) > len) {
>>               /* We're reading garbage from the controller */
>>               dev_warn(&pdev->dev, "xHCI controller failing to respond");
>> -             return;
>> +             goto hc_init;
>
> Are you sure this is correct?  That goto location then does a whole
> bunch of things with the xhci controller that you just now determined is
> failing to respond.  I can't take this as-is, sorry.
>
> greg k-h

Yes I agree, and in the first patch I didn't do this way.
But the latest patch which got introduced is doing "goto hc_init" at line 990

        ext_cap_offset = xhci_find_next_ext_cap(base, 0, XHCI_EXT_CAPS_LEGACY);

        if (!ext_cap_offset)
                goto hc_init;

I think this is wrong too, may be I am wrong.

Any way I will send the first patch again on top of usb-next as v3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1284026 — [PATCH v3] usb: host: pci_quirks: fix memory leak, by adding iounmap

FromSaurabh Sengar <saurabh.truth@gmail.com>
Date2015-12-04 18:00 +0100
Subject[PATCH v3] usb: host: pci_quirks: fix memory leak, by adding iounmap
Message-ID<qC1Sa-5fB-35@gated-at.bofh.it>
In reply to#1283990
added iounmap inorder to free memory mapped to base before returning

Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
---
v3: reverted to v1 logic, on top of usb-next branch
 drivers/usb/host/pci-quirks.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 26cb8c8..35af362 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -992,7 +992,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
 	if ((ext_cap_offset + sizeof(val)) > len) {
 		/* We're reading garbage from the controller */
 		dev_warn(&pdev->dev, "xHCI controller failing to respond");
-		return;
+		goto iounmap;
 	}
 	val = readl(base + ext_cap_offset);
 
@@ -1055,6 +1055,7 @@ hc_init:
 			 XHCI_MAX_HALT_USEC, val);
 	}
 
+iounmap:
 	iounmap(base);
 }
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web