[B][D][E][F][SRU][PATCH 0/1] Fix for CVE-2019-19082

classic Classic list List threaded Threaded
13 messages Options
Reply | Threaded
Open this post in threaded view
|

[B][D][E][F][SRU][PATCH 0/1] Fix for CVE-2019-19082

Po-Hsu Lin (Sam)
From the commit message:
In dcn*_create_resource_pool the allocated memory should be released if
construct pool fails.

This patch can be cherry-picked into B/D/E/F. The generated patch for
Bionic can be applied to Disco, the one from Eoan can be applied to
Focal.

Kernel test builds OK.

Navid Emamdoost (1):
  drm/amd/display: prevent memory leak

 drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
 5 files changed, 5 insertions(+)

--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[B][D][SRU][CVE-2019-19082][PATCH 1/1] drm/amd/display: prevent memory leak

Po-Hsu Lin (Sam)
From: Navid Emamdoost <[hidden email]>

CVE-2019-19082

In dcn*_create_resource_pool the allocated memory should be released if
construct pool fails.

Reviewed-by: Harry Wentland <[hidden email]>
Signed-off-by: Navid Emamdoost <[hidden email]>
Signed-off-by: Alex Deucher <[hidden email]>
(cherry picked from commit 104c307147ad379617472dd91a5bcb368d72bd6d)
Signed-off-by: Po-Hsu Lin <[hidden email]>
---
 drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
index 515e76c..8839e84 100644
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
@@ -940,6 +940,7 @@ struct resource_pool *dce100_create_resource_pool(
  if (construct(num_virtual_links, dc, pool))
  return &pool->base;
 
+ kfree(pool);
  BREAK_TO_DEBUGGER();
  return NULL;
 }
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
index 42df17f..3cf5871 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
@@ -1324,6 +1324,7 @@ struct resource_pool *dce110_create_resource_pool(
  if (construct(num_virtual_links, dc, pool, asic_id))
  return &pool->base;
 
+ kfree(pool);
  BREAK_TO_DEBUGGER();
  return NULL;
 }
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
index 663e0a0..65c3fe3 100644
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
@@ -1278,6 +1278,7 @@ struct resource_pool *dce112_create_resource_pool(
  if (construct(num_virtual_links, dc, pool))
  return &pool->base;
 
+ kfree(pool);
  BREAK_TO_DEBUGGER();
  return NULL;
 }
diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
index 5c48c22..184ebed 100644
--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
@@ -999,6 +999,7 @@ struct resource_pool *dce120_create_resource_pool(
  if (construct(num_virtual_links, dc, pool))
  return &pool->base;
 
+ kfree(pool);
  BREAK_TO_DEBUGGER();
  return NULL;
 }
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index 9fc8f82..f3edc41 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -1463,6 +1463,7 @@ struct resource_pool *dcn10_create_resource_pool(
  if (construct(num_virtual_links, dc, pool))
  return &pool->base;
 
+ kfree(pool);
  BREAK_TO_DEBUGGER();
  return NULL;
 }
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[E][F][SRU][CVE-2019-19082][PATCH 1/1] drm/amd/display: prevent memory leak

Po-Hsu Lin (Sam)
In reply to this post by Po-Hsu Lin (Sam)
From: Navid Emamdoost <[hidden email]>

CVE-2019-19082

In dcn*_create_resource_pool the allocated memory should be released if
construct pool fails.

Reviewed-by: Harry Wentland <[hidden email]>
Signed-off-by: Navid Emamdoost <[hidden email]>
Signed-off-by: Alex Deucher <[hidden email]>
(cherry picked from commit 104c307147ad379617472dd91a5bcb368d72bd6d)
Signed-off-by: Po-Hsu Lin <[hidden email]>
---
 drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
index 45f7421..ce1b1dc 100644
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
@@ -1094,6 +1094,7 @@ struct resource_pool *dce100_create_resource_pool(
  if (construct(num_virtual_links, dc, pool))
  return &pool->base;
 
+ kfree(pool);
  BREAK_TO_DEBUGGER();
  return NULL;
 }
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
index 0cb83b0..2c11a33 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
@@ -1465,6 +1465,7 @@ struct resource_pool *dce110_create_resource_pool(
  if (construct(num_virtual_links, dc, pool, asic_id))
  return &pool->base;
 
+ kfree(pool);
  BREAK_TO_DEBUGGER();
  return NULL;
 }
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
index 918455c..e0ed736 100644
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
@@ -1343,6 +1343,7 @@ struct resource_pool *dce112_create_resource_pool(
  if (construct(num_virtual_links, dc, pool))
  return &pool->base;
 
+ kfree(pool);
  BREAK_TO_DEBUGGER();
  return NULL;
 }
diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
index 49f3f0f..f74d51d 100644
--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
@@ -1209,6 +1209,7 @@ struct resource_pool *dce120_create_resource_pool(
  if (construct(num_virtual_links, dc, pool))
  return &pool->base;
 
+ kfree(pool);
  BREAK_TO_DEBUGGER();
  return NULL;
 }
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index 3f25e8d..bcabb6b 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -1563,6 +1563,7 @@ struct resource_pool *dcn10_create_resource_pool(
  if (construct(init_data->num_virtual_links, dc, pool))
  return &pool->base;
 
+ kfree(pool);
  BREAK_TO_DEBUGGER();
  return NULL;
 }
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK/Cmnt: [B][D][E][F][SRU][PATCH 0/1] Fix for CVE-2019-19082

Connor Kuehl
In reply to this post by Po-Hsu Lin (Sam)
On 12/1/19 8:51 PM, Po-Hsu Lin wrote:
>  From the commit message:
> In dcn*_create_resource_pool the allocated memory should be released if
> construct pool fails.
>
> This patch can be cherry-picked into B/D/E/F. The generated patch for
> Bionic can be applied to Disco, the one from Eoan can be applied to
> Focal.

Even though it just looks like offset adjustments, I'd err on turning
the "cherry picked from " line into a "backported from" for the series
(probably Bionic/Disco?) that the mainline patch doesn't directly apply
to with "git am".

Acked-by: Connor Kuehl <[hidden email]>

>
> Kernel test builds OK.
>
> Navid Emamdoost (1):
>    drm/amd/display: prevent memory leak
>
>   drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
>   drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
>   drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
>   drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
>   drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
>   5 files changed, 5 insertions(+)
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: ACK/Cmnt: [B][D][E][F][SRU][PATCH 0/1] Fix for CVE-2019-19082

Po-Hsu Lin (Sam)
Hi Connor,

Thanks for reviewing this, as this patch commit SHA1 can be applied
with git cherry-pick command, maybe this should not be considered as a
backport?
I think there were some discussions for this kind of fuzzy-appy thing
before, but IIRC that's for can a generated patch be applied to all
the series.

Cheers
Sam


On Sat, Dec 7, 2019 at 4:46 AM Connor Kuehl <[hidden email]> wrote:

>
> On 12/1/19 8:51 PM, Po-Hsu Lin wrote:
> >  From the commit message:
> > In dcn*_create_resource_pool the allocated memory should be released if
> > construct pool fails.
> >
> > This patch can be cherry-picked into B/D/E/F. The generated patch for
> > Bionic can be applied to Disco, the one from Eoan can be applied to
> > Focal.
>
> Even though it just looks like offset adjustments, I'd err on turning
> the "cherry picked from " line into a "backported from" for the series
> (probably Bionic/Disco?) that the mainline patch doesn't directly apply
> to with "git am".
>
> Acked-by: Connor Kuehl <[hidden email]>
>
> >
> > Kernel test builds OK.
> >
> > Navid Emamdoost (1):
> >    drm/amd/display: prevent memory leak
> >
> >   drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
> >   drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
> >   drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
> >   drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
> >   drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
> >   5 files changed, 5 insertions(+)
> >
>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

NAK[D]: [B][D][E][F][SRU][PATCH 0/1] Fix for CVE-2019-19082

Kleber Souza
In reply to this post by Po-Hsu Lin (Sam)
On 2019-12-02 05:51, Po-Hsu Lin wrote:

> From the commit message:
> In dcn*_create_resource_pool the allocated memory should be released if
> construct pool fails.
>
> This patch can be cherry-picked into B/D/E/F. The generated patch for
> Bionic can be applied to Disco, the one from Eoan can be applied to
> Focal.
>
> Kernel test builds OK.
>
> Navid Emamdoost (1):
>   drm/amd/display: prevent memory leak
>
>  drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
>  drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
>  drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
>  drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
>  drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
>  5 files changed, 5 insertions(+)
>

Disco will EOL in January and we are not planning to release another
kernel SRU for it. So I'm NAK'ing the patches for D.

Thanks,
Kleber


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

UN-NAK[D]: [B][D][E][F][SRU][PATCH 0/1] Fix for CVE-2019-19082

Kleber Souza
On 12.12.19 11:50, Kleber Souza wrote:

> On 2019-12-02 05:51, Po-Hsu Lin wrote:
>> From the commit message:
>> In dcn*_create_resource_pool the allocated memory should be released if
>> construct pool fails.
>>
>> This patch can be cherry-picked into B/D/E/F. The generated patch for
>> Bionic can be applied to Disco, the one from Eoan can be applied to
>> Focal.
>>
>> Kernel test builds OK.
>>
>> Navid Emamdoost (1):
>>   drm/amd/display: prevent memory leak
>>
>>  drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
>>  drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
>>  drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
>>  drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
>>  drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
>>  5 files changed, 5 insertions(+)
>>
>
> Disco will EOL in January and we are not planning to release another
> kernel SRU for it. So I'm NAK'ing the patches for D.
>

Although Disco support will end in January, our plan is to continue producing
5.0 kernel updates for a yet to be defined period.

So please disregard my NAK to this patch.

Thanks.

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: ACK/Cmnt: [B][D][E][F][SRU][PATCH 0/1] Fix for CVE-2019-19082

Kleber Souza
In reply to this post by Po-Hsu Lin (Sam)
On 09.12.19 11:46, Po-Hsu Lin wrote:
> Hi Connor,
>
> Thanks for reviewing this, as this patch commit SHA1 can be applied
> with git cherry-pick command, maybe this should not be considered as a
> backport?
> I think there were some discussions for this kind of fuzzy-appy thing
> before, but IIRC that's for can a generated patch be applied to all
> the series.

Hi Sam,

Our definition of "cherry-pick" is a bit different from the one used
by git. For us to consider a patch to be "cherry picked" from a given
SHA1, when you generate a patch from the original tree (e.g. Linus'
tree) using "git format-patch" we need to be able to apply the
resulting patch to the target repo with "git am". Sometimes there is
only a small difference in the context and a patch can be applied
using "git am -C2", in that case the submitter just needs to state in
the cover letter that "-C2" is needed.

If that doesn't work, and even if we need to do a "git cherry-pick"
first on the target repo and generate the patch from there, then
it's consider to be "backported from".


Thanks,
Kleber


>
> Cheers
> Sam
>
>
> On Sat, Dec 7, 2019 at 4:46 AM Connor Kuehl <[hidden email]> wrote:
>>
>> On 12/1/19 8:51 PM, Po-Hsu Lin wrote:
>>>  From the commit message:
>>> In dcn*_create_resource_pool the allocated memory should be released if
>>> construct pool fails.
>>>
>>> This patch can be cherry-picked into B/D/E/F. The generated patch for
>>> Bionic can be applied to Disco, the one from Eoan can be applied to
>>> Focal.
>>
>> Even though it just looks like offset adjustments, I'd err on turning
>> the "cherry picked from " line into a "backported from" for the series
>> (probably Bionic/Disco?) that the mainline patch doesn't directly apply
>> to with "git am".
>>
>> Acked-by: Connor Kuehl <[hidden email]>
>>
>>>
>>> Kernel test builds OK.
>>>
>>> Navid Emamdoost (1):
>>>    drm/amd/display: prevent memory leak
>>>
>>>   drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
>>>   drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
>>>   drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
>>>   drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
>>>   drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
>>>   5 files changed, 5 insertions(+)
>>>
>>
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: ACK/Cmnt: [B][D][E][F][SRU][PATCH 0/1] Fix for CVE-2019-19082

Po-Hsu Lin (Sam)
Hi Kleber,

thanks for the explanation, do you have a suggested workflow on this?
I used to run git cherry-pick command under different trees, now I am
doing this with:
  1. git format-patch SHA1 -1 in Linus' tree
  2. Try to apply it to our tree with git am -C2
  3. Reset HEAD^ in our tree, and run git cherry-pick SHA1 to
determine if it can be called as a cherry-pick

I tried the kteam-tools/stable/cherry-pick.sh script, but it can't
tell if it should be considered as a backport.

Thanks
Sam


On Tue, Dec 17, 2019 at 4:55 PM Kleber Souza <[hidden email]> wrote:

>
> On 09.12.19 11:46, Po-Hsu Lin wrote:
> > Hi Connor,
> >
> > Thanks for reviewing this, as this patch commit SHA1 can be applied
> > with git cherry-pick command, maybe this should not be considered as a
> > backport?
> > I think there were some discussions for this kind of fuzzy-appy thing
> > before, but IIRC that's for can a generated patch be applied to all
> > the series.
>
> Hi Sam,
>
> Our definition of "cherry-pick" is a bit different from the one used
> by git. For us to consider a patch to be "cherry picked" from a given
> SHA1, when you generate a patch from the original tree (e.g. Linus'
> tree) using "git format-patch" we need to be able to apply the
> resulting patch to the target repo with "git am". Sometimes there is
> only a small difference in the context and a patch can be applied
> using "git am -C2", in that case the submitter just needs to state in
> the cover letter that "-C2" is needed.
>
> If that doesn't work, and even if we need to do a "git cherry-pick"
> first on the target repo and generate the patch from there, then
> it's consider to be "backported from".
>
>
> Thanks,
> Kleber
>
>
> >
> > Cheers
> > Sam
> >
> >
> > On Sat, Dec 7, 2019 at 4:46 AM Connor Kuehl <[hidden email]> wrote:
> >>
> >> On 12/1/19 8:51 PM, Po-Hsu Lin wrote:
> >>>  From the commit message:
> >>> In dcn*_create_resource_pool the allocated memory should be released if
> >>> construct pool fails.
> >>>
> >>> This patch can be cherry-picked into B/D/E/F. The generated patch for
> >>> Bionic can be applied to Disco, the one from Eoan can be applied to
> >>> Focal.
> >>
> >> Even though it just looks like offset adjustments, I'd err on turning
> >> the "cherry picked from " line into a "backported from" for the series
> >> (probably Bionic/Disco?) that the mainline patch doesn't directly apply
> >> to with "git am".
> >>
> >> Acked-by: Connor Kuehl <[hidden email]>
> >>
> >>>
> >>> Kernel test builds OK.
> >>>
> >>> Navid Emamdoost (1):
> >>>    drm/amd/display: prevent memory leak
> >>>
> >>>   drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
> >>>   drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
> >>>   drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
> >>>   drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
> >>>   drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
> >>>   5 files changed, 5 insertions(+)
> >>>
> >>
> >
>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: ACK/Cmnt: [B][D][E][F][SRU][PATCH 0/1] Fix for CVE-2019-19082

Kleber Souza
Hi Sam,

On 2020-01-02 12:39, Po-Hsu Lin wrote:
> Hi Kleber,
>
> thanks for the explanation, do you have a suggested workflow on this?
> I used to run git cherry-pick command under different trees, now I am
> doing this with:
>   1. git format-patch SHA1 -1 in Linus' tree
>   2. Try to apply it to our tree with git am -C2

I would try to apply without -C2 first in all the target trees. If it doesn't
work, then try with -C2. If it works, keep the SHA1 as cherry-pick but
make a note on the cover letter that -C2 is needed. If it doesn't work in some
of the trees, then those need to be labeled as backported.

>   3. Reset HEAD^ in our tree, and run git cherry-pick SHA1 to
> determine if it can be called as a cherry-pick

To be called as cherry-pick the patches need to be able to applied with
'git am' from the original SHA1 as stated above. If it doesn't work
the patches need to be labeled as backported even if 'git cherry-pick' applies
it.

>
> I tried the kteam-tools/stable/cherry-pick.sh script, but it can't
> tell if it should be considered as a backport.

This script hasn't had any change in years, so I guess people are not
really using it. Looking at the source it seems to not really differentiate
between a clean cherry-pick and a backport.


Thanks,
Klber

>
> Thanks
> Sam
>
>
> On Tue, Dec 17, 2019 at 4:55 PM Kleber Souza <[hidden email]> wrote:
>>
>> On 09.12.19 11:46, Po-Hsu Lin wrote:
>>> Hi Connor,
>>>
>>> Thanks for reviewing this, as this patch commit SHA1 can be applied
>>> with git cherry-pick command, maybe this should not be considered as a
>>> backport?
>>> I think there were some discussions for this kind of fuzzy-appy thing
>>> before, but IIRC that's for can a generated patch be applied to all
>>> the series.
>>
>> Hi Sam,
>>
>> Our definition of "cherry-pick" is a bit different from the one used
>> by git. For us to consider a patch to be "cherry picked" from a given
>> SHA1, when you generate a patch from the original tree (e.g. Linus'
>> tree) using "git format-patch" we need to be able to apply the
>> resulting patch to the target repo with "git am". Sometimes there is
>> only a small difference in the context and a patch can be applied
>> using "git am -C2", in that case the submitter just needs to state in
>> the cover letter that "-C2" is needed.
>>
>> If that doesn't work, and even if we need to do a "git cherry-pick"
>> first on the target repo and generate the patch from there, then
>> it's consider to be "backported from".
>>
>>
>> Thanks,
>> Kleber
>>
>>
>>>
>>> Cheers
>>> Sam
>>>
>>>
>>> On Sat, Dec 7, 2019 at 4:46 AM Connor Kuehl <[hidden email]> wrote:
>>>>
>>>> On 12/1/19 8:51 PM, Po-Hsu Lin wrote:
>>>>>  From the commit message:
>>>>> In dcn*_create_resource_pool the allocated memory should be released if
>>>>> construct pool fails.
>>>>>
>>>>> This patch can be cherry-picked into B/D/E/F. The generated patch for
>>>>> Bionic can be applied to Disco, the one from Eoan can be applied to
>>>>> Focal.
>>>>
>>>> Even though it just looks like offset adjustments, I'd err on turning
>>>> the "cherry picked from " line into a "backported from" for the series
>>>> (probably Bionic/Disco?) that the mainline patch doesn't directly apply
>>>> to with "git am".
>>>>
>>>> Acked-by: Connor Kuehl <[hidden email]>
>>>>
>>>>>
>>>>> Kernel test builds OK.
>>>>>
>>>>> Navid Emamdoost (1):
>>>>>    drm/amd/display: prevent memory leak
>>>>>
>>>>>   drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
>>>>>   drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
>>>>>   drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
>>>>>   drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
>>>>>   drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
>>>>>   5 files changed, 5 insertions(+)
>>>>>
>>>>
>>>
>>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK/Cmnt: [B][D][E][F][SRU][PATCH 0/1] Fix for CVE-2019-19082

Kleber Souza
In reply to this post by Po-Hsu Lin (Sam)
On 2019-12-02 05:51, Po-Hsu Lin wrote:

> From the commit message:
> In dcn*_create_resource_pool the allocated memory should be released if
> construct pool fails.
>
> This patch can be cherry-picked into B/D/E/F. The generated patch for
> Bionic can be applied to Disco, the one from Eoan can be applied to
> Focal.
>
> Kernel test builds OK.
>
> Navid Emamdoost (1):
>   drm/amd/display: prevent memory leak
>
>  drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
>  drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
>  drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
>  drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
>  drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
>  5 files changed, 5 insertions(+)
>

With the patches for B/D marked as backports as discussed:

Acked-by: Kleber Sacilotto de Souza <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED[B/D/E]/Cmnt: [B][D][E][F][SRU][PATCH 0/1] Fix for CVE-2019-19082

Kleber Souza
In reply to this post by Po-Hsu Lin (Sam)
On 2019-12-02 05:51, Po-Hsu Lin wrote:

> From the commit message:
> In dcn*_create_resource_pool the allocated memory should be released if
> construct pool fails.
>
> This patch can be cherry-picked into B/D/E/F. The generated patch for
> Bionic can be applied to Disco, the one from Eoan can be applied to
> Focal.
>
> Kernel test builds OK.
>
> Navid Emamdoost (1):
>   drm/amd/display: prevent memory leak
>
>  drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
>  drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
>  drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
>  drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
>  drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
>  5 files changed, 5 insertions(+)
>

Applied to Bionic, Disco and Eoan, with the patches for B/D marked
as "backported from commit ...".

Thanks,
Kleber

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

NAK[F]: [B][D][E][F][SRU][PATCH 0/1] Fix for CVE-2019-19082

Seth Forshee
In reply to this post by Po-Hsu Lin (Sam)
On Mon, Dec 02, 2019 at 12:51:30PM +0800, Po-Hsu Lin wrote:
> From the commit message:
> In dcn*_create_resource_pool the allocated memory should be released if
> construct pool fails.
>
> This patch can be cherry-picked into B/D/E/F. The generated patch for
> Bionic can be applied to Disco, the one from Eoan can be applied to
> Focal.
>
> Kernel test builds OK.

Focal is now using linux 5.4, and since this patch is from 5.4-rc1 it is
not needed there.

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team