diff mbox

mac80211: fix memory leak

Message ID 1454060944-11320-1-git-send-email-sudipm.mukherjee@gmail.com (mailing list archive)
State Superseded
Delegated to: Johannes Berg
Headers show

Commit Message

Sudip Mukherjee Jan. 29, 2016, 9:49 a.m. UTC
On error we jumped to the error label and returned the error code but we
missed releasing sinfo.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 net/mac80211/sta_info.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Julian Calaby Feb. 1, 2016, 12:03 a.m. UTC | #1
Hi Sudip,

On Fri, Jan 29, 2016 at 8:49 PM, Sudip Mukherjee
<sudipm.mukherjee@gmail.com> wrote:
> On error we jumped to the error label and returned the error code but we
> missed releasing sinfo.
>
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>

Should the From: and Signed-off-by: email addresses be the same?

> ---
>  net/mac80211/sta_info.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
> index 6c198e6..36e75c4 100644
> --- a/net/mac80211/sta_info.c
> +++ b/net/mac80211/sta_info.c
> @@ -561,6 +561,7 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
>         __cleanup_single_sta(sta);
>   out_err:
>         mutex_unlock(&local->sta_mtx);
> +       kfree(sinfo);
>         rcu_read_lock();
>         return err;
>  }

Looks sane to me. I must note that the bug this is fixing is only in
the mac80211-next tree.

Fixes: 5fe74014172d ("mac80211: avoid excessive stack usage in sta_info")
Reviewed-by: Julian Calaby <julian.calaby@gmail.com>

Thanks,
Sudip Mukherjee Feb. 1, 2016, 4:25 a.m. UTC | #2
On Mon, Feb 01, 2016 at 11:03:35AM +1100, Julian Calaby wrote:
> Hi Sudip,
> 
> On Fri, Jan 29, 2016 at 8:49 PM, Sudip Mukherjee
> <sudipm.mukherjee@gmail.com> wrote:
> > On error we jumped to the error label and returned the error code but we
> > missed releasing sinfo.
> >
> > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> 
> Should the From: and Signed-off-by: email addresses be the same?

I think 2 years back I had a long discussion with Greg about this and
since then I al submitting patches like this. A small summayg of the
problem from that discussion:

"we have strict DMARC check for the corporate mail server. DMARC =
domain based message authentication.
So the mail i sent reached all the list subscriber from a different
server than our designated server, and as a result it is marked as spam
in many places and I have already received a few complaints regarding
that."

> 
> > ---
> >  net/mac80211/sta_info.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
> > index 6c198e6..36e75c4 100644
> > --- a/net/mac80211/sta_info.c
> > +++ b/net/mac80211/sta_info.c
> > @@ -561,6 +561,7 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
> >         __cleanup_single_sta(sta);
> >   out_err:
> >         mutex_unlock(&local->sta_mtx);
> > +       kfree(sinfo);
> >         rcu_read_lock();
> >         return err;
> >  }
> 
> Looks sane to me. I must note that the bug this is fixing is only in
> the mac80211-next tree.
> 
> Fixes: 5fe74014172d ("mac80211: avoid excessive stack usage in sta_info")
> Reviewed-by: Julian Calaby <julian.calaby@gmail.com>

thanks

regards
sudip
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Julian Calaby Feb. 1, 2016, 4:30 a.m. UTC | #3
Hi Sudip,

On Mon, Feb 1, 2016 at 3:25 PM, Sudip Mukherjee
<sudipm.mukherjee@gmail.com> wrote:
> On Mon, Feb 01, 2016 at 11:03:35AM +1100, Julian Calaby wrote:
>> Hi Sudip,
>>
>> On Fri, Jan 29, 2016 at 8:49 PM, Sudip Mukherjee
>> <sudipm.mukherjee@gmail.com> wrote:
>> > On error we jumped to the error label and returned the error code but we
>> > missed releasing sinfo.
>> >
>> > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
>>
>> Should the From: and Signed-off-by: email addresses be the same?
>
> I think 2 years back I had a long discussion with Greg about this and
> since then I al submitting patches like this. A small summayg of the
> problem from that discussion:
>
> "we have strict DMARC check for the corporate mail server. DMARC =
> domain based message authentication.
> So the mail i sent reached all the list subscriber from a different
> server than our designated server, and as a result it is marked as spam
> in many places and I have already received a few complaints regarding
> that."

Ok, fair enough then.

Thanks,
Kalle Valo Feb. 1, 2016, 9:28 a.m. UTC | #4
Sudip Mukherjee <sudipm.mukherjee@gmail.com> writes:

> On Mon, Feb 01, 2016 at 11:03:35AM +1100, Julian Calaby wrote:
>> Hi Sudip,
>> 
>> On Fri, Jan 29, 2016 at 8:49 PM, Sudip Mukherjee
>> <sudipm.mukherjee@gmail.com> wrote:
>> > On error we jumped to the error label and returned the error code but we
>> > missed releasing sinfo.
>> >
>> > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
>> 
>> Should the From: and Signed-off-by: email addresses be the same?
>
> I think 2 years back I had a long discussion with Greg about this and
> since then I al submitting patches like this. A small summayg of the
> problem from that discussion:
>
> "we have strict DMARC check for the corporate mail server. DMARC =
> domain based message authentication.
> So the mail i sent reached all the list subscriber from a different
> server than our designated server, and as a result it is marked as spam
> in many places and I have already received a few complaints regarding
> that."

You can add a separate "From:" line to the beginning of the commit log
and git will use it then commiting the patch. I didn't find any
documention but it's easy to do and should solve this.
Sudip Mukherjee Feb. 1, 2016, 9:33 a.m. UTC | #5
On Mon, Feb 01, 2016 at 11:28:37AM +0200, Kalle Valo wrote:
> Sudip Mukherjee <sudipm.mukherjee@gmail.com> writes:
> 
> > On Mon, Feb 01, 2016 at 11:03:35AM +1100, Julian Calaby wrote:
> >> Hi Sudip,
> >> 
> >> On Fri, Jan 29, 2016 at 8:49 PM, Sudip Mukherjee
> >> <sudipm.mukherjee@gmail.com> wrote:
> >> > On error we jumped to the error label and returned the error code but we
> >> > missed releasing sinfo.
> >> >
> >> > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> >> 
> >> Should the From: and Signed-off-by: email addresses be the same?
> >
> > I think 2 years back I had a long discussion with Greg about this and
> > since then I al submitting patches like this. A small summayg of the
> > problem from that discussion:
> >
> > "we have strict DMARC check for the corporate mail server. DMARC =
> > domain based message authentication.
> > So the mail i sent reached all the list subscriber from a different
> > server than our designated server, and as a result it is marked as spam
> > in many places and I have already received a few complaints regarding
> > that."
> 
> You can add a separate "From:" line to the beginning of the commit log
> and git will use it then commiting the patch. I didn't find any
> documention but it's easy to do and should solve this.

Documentation is not needed. :)
I have done that couple of time.
I will resend this patch with the extra From: line.

regards
sudip
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Julian Calaby Feb. 1, 2016, 10:23 a.m. UTC | #6
Hi Sudip,

On Mon, Feb 1, 2016 at 8:33 PM, Sudip Mukherjee
<sudipm.mukherjee@gmail.com> wrote:
> On Mon, Feb 01, 2016 at 11:28:37AM +0200, Kalle Valo wrote:
>> Sudip Mukherjee <sudipm.mukherjee@gmail.com> writes:
>>
>> > On Mon, Feb 01, 2016 at 11:03:35AM +1100, Julian Calaby wrote:
>> >> Hi Sudip,
>> >>
>> >> On Fri, Jan 29, 2016 at 8:49 PM, Sudip Mukherjee
>> >> <sudipm.mukherjee@gmail.com> wrote:
>> >> > On error we jumped to the error label and returned the error code but we
>> >> > missed releasing sinfo.
>> >> >
>> >> > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
>> >>
>> >> Should the From: and Signed-off-by: email addresses be the same?
>> >
>> > I think 2 years back I had a long discussion with Greg about this and
>> > since then I al submitting patches like this. A small summayg of the
>> > problem from that discussion:
>> >
>> > "we have strict DMARC check for the corporate mail server. DMARC =
>> > domain based message authentication.
>> > So the mail i sent reached all the list subscriber from a different
>> > server than our designated server, and as a result it is marked as spam
>> > in many places and I have already received a few complaints regarding
>> > that."
>>
>> You can add a separate "From:" line to the beginning of the commit log
>> and git will use it then commiting the patch. I didn't find any
>> documention but it's easy to do and should solve this.
>
> Documentation is not needed. :)
> I have done that couple of time.
> I will resend this patch with the extra From: line.

Don't forget to include the Fixes: tag.

Thanks,
Sergei Shtylyov Feb. 1, 2016, 12:57 p.m. UTC | #7
Hello.

On 2/1/2016 12:28 PM, Kalle Valo wrote:

>> On Mon, Feb 01, 2016 at 11:03:35AM +1100, Julian Calaby wrote:
>>> Hi Sudip,
>>>
>>> On Fri, Jan 29, 2016 at 8:49 PM, Sudip Mukherjee
>>> <sudipm.mukherjee@gmail.com> wrote:
>>>> On error we jumped to the error label and returned the error code but we
>>>> missed releasing sinfo.
>>>>
>>>> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
>>>
>>> Should the From: and Signed-off-by: email addresses be the same?
>>
>> I think 2 years back I had a long discussion with Greg about this and
>> since then I al submitting patches like this. A small summayg of the
>> problem from that discussion:
>>
>> "we have strict DMARC check for the corporate mail server. DMARC =
>> domain based message authentication.
>> So the mail i sent reached all the list subscriber from a different
>> server than our designated server, and as a result it is marked as spam
>> in many places and I have already received a few complaints regarding
>> that."
>
> You can add a separate "From:" line to the beginning of the commit log
> and git will use it then commiting the patch. I didn't find any
> documention but it's easy to do and should solve this.

    Documentation/SubmittingPatches, clause 14.

MBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 6c198e6..36e75c4 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -561,6 +561,7 @@  static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
 	__cleanup_single_sta(sta);
  out_err:
 	mutex_unlock(&local->sta_mtx);
+	kfree(sinfo);
 	rcu_read_lock();
 	return err;
 }