drm/amd: Fix random crashes due to bad kfree
Subsystems (5)
PATCH 1/1 drm/amd: Fix random crashes due to bad kfree
Commit c6a837088bed ("drm/amd/display: Fetch the EDID from _DDC if available for eDP") added function dm_helpers_probe_acpi_edid, which fetches the EDID from the BIOS by calling acpi_video_get_edid. acpi_video_get_edid returns a pointer to the EDID, but this pointer does not originate from kmalloc - it is actually the internal "pointer" field from an acpi_buffer struct (which did come from kmalloc). dm_helpers_probe_acpi_edid then attempts to kfree the EDID pointer, resulting in memory corruption which leads to random, intermittent crashes (e.g. 4% of boots will fail with some Oops).
Fix this by allocating a new array (which can be safely freed) for the EDID data in acpi_video_get_edid, and correctly freeing the acpi_buffer.
The only other caller of acpi_video_get_edid is nouveau_acpi_edid:
remove the extraneous kmemdup here as the EDID data is now copied in acpi_video_get_edid.
--- drivers/acpi/acpi_video.c | 3 ++- drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/acpi/acpi_video.c +2 -1
@@ -1485,7 +1485,8 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id,if (!length)continue ; - *edid = buffer->buffer.pointer; + *edid =kmemdup (buffer->buffer.pointer, length,GFP_KERNEL ); +kfree (buffer);return length; }
drivers/gpu/drm/nouveau/nouveau_acpi.c +1 -1
@@ -384,7 +384,7 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)if (ret <0 )return NULL ; -return kmemdup (edid,EDID_LENGTH ,GFP_KERNEL ); +return edid; }bool nouveau_acpi_video_backlight_use_native (void )
Signature · 1 line
2.39.5
Hi Chris!
Quoted 10 lines · Chris Bainbridge
Commit
c6a837088bed("drm/amd/display: Fetch the EDID from_DDCif available for eDP") added functiondm_helpers_probe_acpi_edid, which fetches the EDID from the BIOS by callingacpi_video_get_edid.acpi_video_get_edidreturns a pointer to the EDID, but this pointer does not originate from kmalloc - it is actually the internal "pointer" field from anacpi_bufferstruct (which did come from kmalloc).dm_helpers_probe_acpi_edidthen attempts to kfree the EDID pointer, resulting in memory corruption which leads to random, intermittent crashes (e.g. 4% of boots will fail with some Oops).
Quoted 2 lines
Fix this by allocating a new array (which can be safely freed) for the EDID data in
acpi_video_get_edid, and correctly freeing theacpi_buffer.
Hmm, maybe I'm missing something here. But shouldn't it suffice to just remove the kfree call in dm_helpers_probe_acpi_edid()?
With best wishes,
Tobias
Quoted 39 lines
The only other caller of
acpi_video_get_edidisnouveau_acpi_edid:
remove the extraneous kmemdup here as the EDID data is now copied inacpi_video_get_edid.Signed-off-by Chris Bainbridge <[email protected]>Fixes c6a837088bed ("drm/amd/display: Fetch the EDID from _DDC if available for eDP")--- drivers/acpi/acpi_video.c | 3 ++- drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/acpi/acpi_video.c +2
-1@@ -1485,7 +1485,8 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id,if (!length)continue ; - *edid = buffer->buffer.pointer; + *edid =kmemdup (buffer->buffer.pointer, length,GFP_KERNEL ); +kfree (buffer);return length; }drivers/gpu/drm/nouveau/nouveau_acpi.c +1
-1@@ -384,7 +384,7 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)if (ret <0 )return NULL ; -return kmemdup (edid,EDID_LENGTH ,GFP_KERNEL ); +return edid; }bool nouveau_acpi_video_backlight_use_native (void )
Quoted 14 lines · Tobias Jakobi
Hi Chris!
Quoted 10 lines · Chris Bainbridge
Commit
c6a837088bed("drm/amd/display: Fetch the EDID from_DDCif available for eDP") added functiondm_helpers_probe_acpi_edid, which fetches the EDID from the BIOS by callingacpi_video_get_edid.acpi_video_get_edidreturns a pointer to the EDID, but this pointer does not originate from kmalloc - it is actually the internal "pointer" field from anacpi_bufferstruct (which did come from kmalloc).dm_helpers_probe_acpi_edidthen attempts to kfree the EDID pointer, resulting in memory corruption which leads to random, intermittent crashes (e.g. 4% of boots will fail with some Oops).
Quoted 5 lines
Quoted 2 lines
Fix this by allocating a new array (which can be safely freed) for the EDID data in
acpi_video_get_edid, and correctly freeing theacpi_buffer.Hmm, maybe I'm missing something here. But shouldn't it suffice to just remove the kfree call in
dm_helpers_probe_acpi_edid()?
Yes, that would work to fix the bad kfree, but there would be a small memory leak of the acpi_buffer struct. It's not a huge problem since this code is rarely run, and the Nouveau code has never tried to free the edid buffer and apparently nobody noticed, but it would be better to do the correct thing.
One other curiosity is this comment in the code that allocates the memory:
case ACPI_ALLOCATE_BUFFER:
/*
* Allocate a new buffer. We directectly call acpi_os_allocate here to
* purposefully bypass the (optionally enabled) internal allocation
* tracking mechanism since we only want to track internal
* allocations. Note: The caller should use acpi_os_free to free this
* buffer created via ACPI_ALLOCATE_BUFFER.
*/
Which makes me wonder if all the calls to kfree on acpi_buffer structs with ACPI_ALLOCATE_BUFFER in acpi_video.c should actually be calls to acpi_os_free instead? I used kfree just for consistency with the existing code.
Quoted 17 lines · Chris Bainbridge
Quoted 16 lines · Tobias Jakobi
Hi Chris!
Quoted 12 lines · Chris Bainbridge
Commit
c6a837088bed("drm/amd/display: Fetch the EDID from_DDCif available for eDP") added functiondm_helpers_probe_acpi_edid, which fetches the EDID from the BIOS by callingacpi_video_get_edid.acpi_video_get_edidreturns a pointer to the EDID, but this pointer does not originate from kmalloc - it is actually the internal "pointer" field from anacpi_bufferstruct (which did come from kmalloc).dm_helpers_probe_acpi_edidthen attempts to kfree the EDID pointer, resulting in memory corruption which leads to random, intermittent crashes (e.g. 4% of boots will fail with some Oops).Fix this by allocating a new array (which can be safely freed) for the EDID data in
acpi_video_get_edid, and correctly freeing theacpi_buffer.
Quoted 7 lines
Quoted 2 lines
Hmm, maybe I'm missing something here. But shouldn't it suffice to just remove the kfree call in
dm_helpers_probe_acpi_edid()?Yes, that would work to fix the bad kfree, but there would be a small memory leak of the
acpi_bufferstruct. It's not a huge problem since this code is rarely run, and the Nouveau code has never tried to free the edid buffer and apparently nobody noticed, but it would be better to do the correct thing.
OK, thanks for explaining. I didn't immediately understand that something was leaking memory. Only that we were freeing something that we are not supposed to free.
Quoted 12 lines
One other curiosity is this comment in the code that allocates the memory:
case
ACPI_ALLOCATE_BUFFER:
/*
* Allocate a new buffer. We directectly callacpi_os_allocatehere to
* purposefully bypass the (optionally enabled) internal allocation
* tracking mechanism since we only want to track internal
* allocations. Note: The caller should useacpi_os_freeto free this
* buffer created viaACPI_ALLOCATE_BUFFER.
*/
Quoted 4 lines
Which makes me wonder if all the calls to kfree on
acpi_bufferstructs withACPI_ALLOCATE_BUFFERinacpi_video.cshould actually be calls toacpi_os_freeinstead? I used kfree just for consistency with the existing code.
Wouldn't it make more sense to do the memdup handling in acpi_video_device_EDID()? This way you have both alloc and free in the same function. But I'm no expert when it comes to the ACPI kernel code. Just my two cents :-D
With best wishes,
Tobias
Quoted 17 lines · Chris Bainbridge
Quoted 16 lines · Tobias Jakobi
Hi Chris!
Quoted 12 lines · Chris Bainbridge
Commit
c6a837088bed("drm/amd/display: Fetch the EDID from_DDCif available for eDP") added functiondm_helpers_probe_acpi_edid, which fetches the EDID from the BIOS by callingacpi_video_get_edid.acpi_video_get_edidreturns a pointer to the EDID, but this pointer does not originate from kmalloc - it is actually the internal "pointer" field from anacpi_bufferstruct (which did come from kmalloc).dm_helpers_probe_acpi_edidthen attempts to kfree the EDID pointer, resulting in memory corruption which leads to random, intermittent crashes (e.g. 4% of boots will fail with some Oops).Fix this by allocating a new array (which can be safely freed) for the EDID data in
acpi_video_get_edid, and correctly freeing theacpi_buffer.
Quoted 7 lines
Quoted 2 lines
Hmm, maybe I'm missing something here. But shouldn't it suffice to just remove the kfree call in
dm_helpers_probe_acpi_edid()?Yes, that would work to fix the bad kfree, but there would be a small memory leak of the
acpi_bufferstruct. It's not a huge problem since this code is rarely run, and the Nouveau code has never tried to free the edid buffer and apparently nobody noticed, but it would be better to do the correct thing.
OK, thanks for explaining. I didn't immediately understand that something was leaking memory. Only that we were freeing something that we are not supposed to free.
Quoted 12 lines
One other curiosity is this comment in the code that allocates the memory:
case
ACPI_ALLOCATE_BUFFER:
/*
* Allocate a new buffer. We directectly callacpi_os_allocatehere to
* purposefully bypass the (optionally enabled) internal allocation
* tracking mechanism since we only want to track internal
* allocations. Note: The caller should useacpi_os_freeto free this
* buffer created viaACPI_ALLOCATE_BUFFER.
*/
Quoted 4 lines
Which makes me wonder if all the calls to kfree on
acpi_bufferstructs withACPI_ALLOCATE_BUFFERinacpi_video.cshould actually be calls toacpi_os_freeinstead? I used kfree just for consistency with the existing code.
Wouldn't it make more sense to do the memdup handling in acpi_video_device_EDID()? This way you have both alloc and free in the same function. But I'm no expert when it comes to the ACPI kernel code. Just my two cents :-D
With best wishes,
Tobias
#regzbot introduced: c6a837088bed ^
Quoted 13 lines · Chris Bainbridge
Commit
c6a837088bed("drm/amd/display: Fetch the EDID from_DDCif available for eDP") added functiondm_helpers_probe_acpi_edid, which fetches the EDID from the BIOS by callingacpi_video_get_edid.acpi_video_get_edidreturns a pointer to the EDID, but this pointer does not originate from kmalloc - it is actually the internal "pointer" field from anacpi_bufferstruct (which did come from kmalloc).dm_helpers_probe_acpi_edidthen attempts to kfree the EDID pointer, resulting in memory corruption which leads to random, intermittent crashes (e.g. 4% of boots will fail with some Oops).Fix this by allocating a new array (which can be safely freed) for the EDID data in
acpi_video_get_edid, and correctly freeing theacpi_buffer.
Quoted 6 lines
The only other caller of
acpi_video_get_edidisnouveau_acpi_edid:
remove the extraneous kmemdup here as the EDID data is now copied inacpi_video_get_edid.Signed-off-by Chris Bainbridge <[email protected]>Fixes c6a837088bed ("drm/amd/display: Fetch the EDID from _DDC if available for eDP")
Thanks, I agree this is a better solution for this issue than duplicating in the AMD driver code.
However, the subject seems wrong given where it lands. This is primarily a patch to ACPI video, so it should be prefixed with "ACPI: video" like other commits to acpi_video.c.
With that subject fixed:
Quoted 32 lines
--- drivers/acpi/acpi_video.c | 3 ++- drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/acpi/acpi_video.c +2
-1@@ -1485,7 +1485,8 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id,if (!length)continue ; - *edid = buffer->buffer.pointer; + *edid =kmemdup (buffer->buffer.pointer, length,GFP_KERNEL ); +kfree (buffer);return length; }drivers/gpu/drm/nouveau/nouveau_acpi.c +1
-1@@ -384,7 +384,7 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)if (ret <0 )return NULL ; -return kmemdup (edid,EDID_LENGTH ,GFP_KERNEL ); +return edid; }bool nouveau_acpi_video_backlight_use_native (void )
Rafael J. Wysocki
maintainerCC Hans who's been dealing with the acpi_video code for some time.
Quoted 40 lines · Chris Bainbridge
Quoted 14 lines · Tobias Jakobi
Hi Chris!
Quoted 10 lines · Chris Bainbridge
Commit
c6a837088bed("drm/amd/display: Fetch the EDID from_DDCif available for eDP") added functiondm_helpers_probe_acpi_edid, which fetches the EDID from the BIOS by callingacpi_video_get_edid.acpi_video_get_edidreturns a pointer to the EDID, but this pointer does not originate from kmalloc - it is actually the internal "pointer" field from anacpi_bufferstruct (which did come from kmalloc).dm_helpers_probe_acpi_edidthen attempts to kfree the EDID pointer, resulting in memory corruption which leads to random, intermittent crashes (e.g. 4% of boots will fail with some Oops).Quoted 5 lines
Quoted 2 lines
Fix this by allocating a new array (which can be safely freed) for the EDID data in
acpi_video_get_edid, and correctly freeing theacpi_buffer.Hmm, maybe I'm missing something here. But shouldn't it suffice to just remove the kfree call in
dm_helpers_probe_acpi_edid()?Yes, that would work to fix the bad kfree, but there would be a small memory leak of the
acpi_bufferstruct. It's not a huge problem since this code is rarely run, and the Nouveau code has never tried to free the edid buffer and apparently nobody noticed, but it would be better to do the correct thing.One other curiosity is this comment in the code that allocates the memory:
case
ACPI_ALLOCATE_BUFFER:
/*
* Allocate a new buffer. We directectly callacpi_os_allocatehere to
* purposefully bypass the (optionally enabled) internal allocation
* tracking mechanism since we only want to track internal
* allocations. Note: The caller should useacpi_os_freeto free this
* buffer created viaACPI_ALLOCATE_BUFFER.
*/
Quoted 4 lines
Which makes me wonder if all the calls to kfree on
acpi_bufferstructs withACPI_ALLOCATE_BUFFERinacpi_video.cshould actually be calls toacpi_os_freeinstead? I used kfree just for consistency with the existing code.
In Linux, acpi_os_free() is a wrapper around kfree(), so it doesn't matter in practice which one is used, although in principle you are right.
So Hans points out that you should check the kmemdup() return value against NULL because returning a nonzero length along with a NULL buffer pointer is confusing at best.
But if you want to kmemdup() the buffer, it is better to additionally check if the length of it really equals to the 'length' value.
And I would put the entire buffer management into acpi_video_device_EDID() including the kmemdup() and make it return the actual length of the buffer on success.
PATCH v2 1/1 ACPI: video: Fix random crashes due to bad kfree
Commit c6a837088bed ("drm/amd/display: Fetch the EDID from _DDC if available for eDP") added function dm_helpers_probe_acpi_edid, which fetches the EDID from the BIOS by calling acpi_video_get_edid. acpi_video_get_edid returns a pointer to the EDID, but this pointer does not originate from kmalloc - it is actually the internal "pointer" field from an acpi_buffer struct (which did come from kmalloc). dm_helpers_probe_acpi_edid then attempts to kfree the EDID pointer, resulting in memory corruption which leads to random, intermittent crashes (e.g. 4% of boots will fail with some Oops).
Fix this by allocating a new array (which can be safely freed) for the EDID data, and correctly freeing the acpi_buffer pointer.
The only other caller of acpi_video_get_edid is nouveau_acpi_edid:
remove the extraneous kmemdup here as the EDID data is now copied in acpi_video_device_EDID.
---
Changes in v2:
- check kmemdup() return value
- move buffer management into acpi_video_device_EDID()
- return actual length value of buffer
--- drivers/acpi/acpi_video.c | 50 ++++++++++++++------------ drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- 2 files changed, 29 insertions(+), 23 deletions(-)
drivers/acpi/acpi_video.c +28 -22
@@ -610,16 +610,29 @@ acpi_video_device_lcd_get_level_current(struct acpi_video_device *device,return 0 ; } +/* +* Arg: +* device : video output device (LCD, CRT, ..) +* edid : address for returned EDID pointer +* length : _DDC length to request (must be a multiple of 128) +* +* Return Value: +* Length of EDID (positive value) or error (negative value) +* +* Get EDID from ACPI _DDC. On success, a pointer to the EDID data is written +* to the edid address, and the length of the EDID is returned. The caller is +* responsible for freeing the edid pointer. +*/ +static int -acpi_video_device_EDID (struct acpi_video_device *device, -union acpi_object **edid,int length) +acpi_video_device_EDID (struct acpi_video_device *device,void **edid,int length) { -int status; +acpi_status status;struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL };union acpi_object *obj;union acpi_object arg0 = {ACPI_TYPE_INTEGER };struct acpi_object_list args = {1 , &arg0 }; - +int ret; *edid =NULL ;
@@ -636,16 +649,17 @@ acpi_video_device_EDID(struct acpi_video_device *device, obj = buffer.pointer; -if (obj && obj->type ==ACPI_TYPE_BUFFER ) - *edid = obj; -else { +if (obj && obj->type ==ACPI_TYPE_BUFFER ) { + *edid =kmemdup (obj->buffer.pointer, obj->buffer.length,GFP_KERNEL ); + ret = *edid ? obj->buffer.length : -ENOMEM ; + }else {acpi_handle_debug (device->dev->handle,"Invalid _DDC data for length %d\n" , length); - status = -EFAULT ; -kfree (obj); + ret = -EFAULT ; } -return status; +kfree (obj); +return ret; }/* bus */
@@ -1435,9 +1449,7 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, {struct acpi_video_bus *video;struct acpi_video_device *video_device; -union acpi_object *buffer =NULL ; -acpi_status status; -int i, length; +int i, length, ret;if (!device || !acpi_driver_data (device))return -EINVAL ;
@@ -1477,16 +1489,10 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, }for (length =512 ; length >0 ; length -=128 ) { - status =acpi_video_device_EDID (video_device, &buffer, - length); -if (ACPI_SUCCESS (status)) -break ; + ret =acpi_video_device_EDID (video_device, edid, length); +if (ret >0 ) +return ret; } -if (!length) -continue ; - - *edid = buffer->buffer.pointer; -return length; }return -ENODEV ;
drivers/gpu/drm/nouveau/nouveau_acpi.c +1 -1
@@ -384,7 +384,7 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)if (ret <0 )return NULL ; -return kmemdup (edid,EDID_LENGTH ,GFP_KERNEL ); +return edid; }bool nouveau_acpi_video_backlight_use_native (void )
Signature · 1 line
2.39.5
Re: [PATCH v2] ACPI: video: Fix random crashes due to bad kfree
Hi,
Quoted 17 lines · Chris Bainbridge
Commit
c6a837088bed("drm/amd/display: Fetch the EDID from_DDCif available for eDP") added functiondm_helpers_probe_acpi_edid, which fetches the EDID from the BIOS by callingacpi_video_get_edid.acpi_video_get_edidreturns a pointer to the EDID, but this pointer does not originate from kmalloc - it is actually the internal "pointer" field from anacpi_bufferstruct (which did come from kmalloc).dm_helpers_probe_acpi_edidthen attempts to kfree the EDID pointer, resulting in memory corruption which leads to random, intermittent crashes (e.g. 4% of boots will fail with some Oops).Fix this by allocating a new array (which can be safely freed) for the EDID data, and correctly freeing the
acpi_bufferpointer.The only other caller of
acpi_video_get_edidisnouveau_acpi_edid:
remove the extraneous kmemdup here as the EDID data is now copied inacpi_video_device_EDID.
Quoted 6 lines
Signed-off-by Chris Bainbridge <[email protected]>Fixes c6a837088bed ("drm/amd/display: Fetch the EDID from _DDC if available for eDP")---> Changes in v2:
- checkkmemdup()return value
- move buffer management intoacpi_video_device_EDID()
- return actual length value of buffer
Thanks, patch looks good to me:
Regards,
Hans
Quoted 111 lines
--- drivers/acpi/acpi_video.c | 50 ++++++++++++++------------ drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- 2 files changed, 29 insertions(+), 23 deletions(-)drivers/acpi/acpi_video.c +28
-22@@ -610,16 +610,29 @@ acpi_video_device_lcd_get_level_current(struct acpi_video_device *device,return 0 ; } +/* +* Arg: +* device : video output device (LCD, CRT, ..) +* edid : address for returned EDID pointer +* length : _DDC length to request (must be a multiple of 128) +* +* Return Value: +* Length of EDID (positive value) or error (negative value) +* +* Get EDID from ACPI _DDC. On success, a pointer to the EDID data is written +* to the edid address, and the length of the EDID is returned. The caller is +* responsible for freeing the edid pointer. +*/ +static int -acpi_video_device_EDID (struct acpi_video_device *device, -union acpi_object **edid,int length) +acpi_video_device_EDID (struct acpi_video_device *device,void **edid,int length) { -int status; +acpi_status status;struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL };union acpi_object *obj;union acpi_object arg0 = {ACPI_TYPE_INTEGER };struct acpi_object_list args = {1 , &arg0 }; - +int ret; *edid =NULL ;@@ -636,16 +649,17 @@ acpi_video_device_EDID(struct acpi_video_device *device, obj = buffer.pointer; -if (obj && obj->type ==ACPI_TYPE_BUFFER ) - *edid = obj; -else { +if (obj && obj->type ==ACPI_TYPE_BUFFER ) { + *edid =kmemdup (obj->buffer.pointer, obj->buffer.length,GFP_KERNEL ); + ret = *edid ? obj->buffer.length : -ENOMEM ; + }else {acpi_handle_debug (device->dev->handle,"Invalid _DDC data for length %d\n" , length); - status = -EFAULT ; -kfree (obj); + ret = -EFAULT ; } -return status; +kfree (obj); +return ret; }/* bus */ @@ -1435,9 +1449,7 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, {struct acpi_video_bus *video;struct acpi_video_device *video_device; -union acpi_object *buffer =NULL ; -acpi_status status; -int i, length; +int i, length, ret;if (!device || !acpi_driver_data (device))return -EINVAL ;@@ -1477,16 +1489,10 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, }for (length =512 ; length >0 ; length -=128 ) { - status =acpi_video_device_EDID (video_device, &buffer, - length); -if (ACPI_SUCCESS (status)) -break ; + ret =acpi_video_device_EDID (video_device, edid, length); +if (ret >0 ) +return ret; } -if (!length) -continue ; - - *edid = buffer->buffer.pointer; -return length; }return -ENODEV ;drivers/gpu/drm/nouveau/nouveau_acpi.c +1
-1@@ -384,7 +384,7 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)if (ret <0 )return NULL ; -return kmemdup (edid,EDID_LENGTH ,GFP_KERNEL ); +return edid; }bool nouveau_acpi_video_backlight_use_native (void )
Re: [PATCH v2] ACPI: video: Fix random crashes due to bad kfree
In reply to Chris BainbridgeQuoted 13 lines · Chris Bainbridge
Commit
c6a837088bed("drm/amd/display: Fetch the EDID from_DDCif available for eDP") added functiondm_helpers_probe_acpi_edid, which fetches the EDID from the BIOS by callingacpi_video_get_edid.acpi_video_get_edidreturns a pointer to the EDID, but this pointer does not originate from kmalloc - it is actually the internal "pointer" field from anacpi_bufferstruct (which did come from kmalloc).dm_helpers_probe_acpi_edidthen attempts to kfree the EDID pointer, resulting in memory corruption which leads to random, intermittent crashes (e.g. 4% of boots will fail with some Oops).Fix this by allocating a new array (which can be safely freed) for the EDID data, and correctly freeing the
acpi_bufferpointer.
Quoted 6 lines
The only other caller of
acpi_video_get_edidisnouveau_acpi_edid:
remove the extraneous kmemdup here as the EDID data is now copied inacpi_video_device_EDID.Signed-off-by Chris Bainbridge <[email protected]>Fixes c6a837088bed ("drm/amd/display: Fetch the EDID from _DDC if available for eDP")
Two minor documentation related comments to consider, otherwise I think the code change looks good. Feel free to include:
Quoted 15 lines
---
Changes in v2:
- checkkmemdup()return value
- move buffer management intoacpi_video_device_EDID()
- return actual length value of buffer--- drivers/acpi/acpi_video.c | 50 ++++++++++++++------------ drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- 2 files changed, 29 insertions(+), 23 deletions(-)drivers/acpi/acpi_video.c +0
-0
drivers/acpi/acpi_video.c acpi_video_device_lcd_get_level_current(struct acpi_video_device *device, · line 614
Quoted 5 lines
drivers/acpi/acpi_video.c +2
-0@@ -610,16 +610,29 @@ acpi_video_device_lcd_get_level_current(struct acpi_video_device *device,return 0 ; } +/* +* Arg:
As you've pretty much written kernel doc, us it better to just make this proper kerneldoc (IE use /**)?
drivers/acpi/acpi_video.c acpi_video_device_lcd_get_level_current(struct acpi_video_device *device, · line 623
Quoted 9 lines
drivers/acpi/acpi_video.c +9
-0+* device : video output device (LCD, CRT, ..) +* edid : address for returned EDID pointer +* length : _DDC length to request (must be a multiple of 128) +* +* Return Value: +* Length of EDID (positive value) or error (negative value) +* +* Get EDID from ACPI _DDC. On success, a pointer to the EDID data is written +* to the edid address, and the length of the EDID is returned. The caller is
Since 'EDID' and 'edid' mean different things in the context of this description for the purpose of clarity I think it would be better to say "the edid pointer address".
Quoted 87 lines
drivers/acpi/acpi_video.c +17
-22+* responsible for freeing the edid pointer. +*/ +static int -acpi_video_device_EDID (struct acpi_video_device *device, -union acpi_object **edid,int length) +acpi_video_device_EDID (struct acpi_video_device *device,void **edid,int length) { -int status; +acpi_status status;struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL };union acpi_object *obj;union acpi_object arg0 = {ACPI_TYPE_INTEGER };struct acpi_object_list args = {1 , &arg0 }; - +int ret; *edid =NULL ;@@ -636,16 +649,17 @@ acpi_video_device_EDID(struct acpi_video_device *device, obj = buffer.pointer; -if (obj && obj->type ==ACPI_TYPE_BUFFER ) - *edid = obj; -else { +if (obj && obj->type ==ACPI_TYPE_BUFFER ) { + *edid =kmemdup (obj->buffer.pointer, obj->buffer.length,GFP_KERNEL ); + ret = *edid ? obj->buffer.length : -ENOMEM ; + }else {acpi_handle_debug (device->dev->handle,"Invalid _DDC data for length %d\n" , length); - status = -EFAULT ; -kfree (obj); + ret = -EFAULT ; } -return status; +kfree (obj); +return ret; }/* bus */ @@ -1435,9 +1449,7 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, {struct acpi_video_bus *video;struct acpi_video_device *video_device; -union acpi_object *buffer =NULL ; -acpi_status status; -int i, length; +int i, length, ret;if (!device || !acpi_driver_data (device))return -EINVAL ;@@ -1477,16 +1489,10 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, }for (length =512 ; length >0 ; length -=128 ) { - status =acpi_video_device_EDID (video_device, &buffer, - length); -if (ACPI_SUCCESS (status)) -break ; + ret =acpi_video_device_EDID (video_device, edid, length); +if (ret >0 ) +return ret; } -if (!length) -continue ; - - *edid = buffer->buffer.pointer; -return length; }return -ENODEV ;drivers/gpu/drm/nouveau/nouveau_acpi.c +1
-1@@ -384,7 +384,7 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)if (ret <0 )return NULL ; -return kmemdup (edid,EDID_LENGTH ,GFP_KERNEL ); +return edid; }bool nouveau_acpi_video_backlight_use_native (void )
Mario Limonciello
Tested-by Borislav Petkov (AMD)Re: [PATCH v2] ACPI: video: Fix random crashes due to bad kfree
Quoted 18 lines · Mario Limonciello
Quoted 17 lines · Chris Bainbridge
Commit
c6a837088bed("drm/amd/display: Fetch the EDID from_DDCif available for eDP") added functiondm_helpers_probe_acpi_edid, which fetches the EDID from the BIOS by callingacpi_video_get_edid.acpi_video_get_edidreturns a pointer to the EDID, but this pointer does not originate from kmalloc - it is actually the internal "pointer" field from anacpi_bufferstruct (which did come from kmalloc).dm_helpers_probe_acpi_edidthen attempts to kfree the EDID pointer, resulting in memory corruption which leads to random, intermittent crashes (e.g. 4% of boots will fail with some Oops).Fix this by allocating a new array (which can be safely freed) for the EDID data, and correctly freeing the
acpi_bufferpointer.The only other caller of
acpi_video_get_edidisnouveau_acpi_edid:
remove the extraneous kmemdup here as the EDID data is now copied inacpi_video_device_EDID.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Chris Bainbridge <[email protected]>Fixes c6a837088bed ("drm/amd/display: Fetch the EDID from _DDC if available for eDP")Two minor documentation related comments to consider, otherwise I think the code change looks good. Feel free to include:
Reviewed-by Mario Limonciello <[email protected]>
A few more tags to collate from another thread:
Quoted 121 lines
Quoted 16 lines
---
Changes in v2:
- checkkmemdup()return value
- move buffer management intoacpi_video_device_EDID()
- return actual length value of buffer
---
drivers/acpi/acpi_video.c | 50 ++++++++++++++------------drivers/gpu/drm/nouveau/nouveau_acpi.c| 2 +-2 files changed, 29 insertions(+), 23 deletions(-)drivers/acpi/acpi_video.c +0
-0drivers/acpi/acpi_video.c acpi_video_device_lcd_get_level_current(struct · line 614
Quoted 5 lines
drivers/acpi/acpi_video.c +2
-0@@ -610,16 +610,29 @@ acpi_video_device_lcd_get_level_current(struct acpi_video_device *device, return 0; } +/* +* Arg: As you've pretty much written kernel doc, us it better to just make this proper kerneldoc (IE use /**)?
Quoted 11 lines
drivers/acpi/acpi_video.c +8
-0+ * device : video output device (LCD, CRT, ..) + * edid : address for returned EDID pointer + * length : _DDC length to request (must be a multiple of 128) + * + * Return Value: + * Length of EDID (positive value) or error (negative value) + * + * Get EDID from ACPI _DDC. On success, a pointer to the EDID datais written
+ * to the edid address, and the length of the EDID is returned. The caller isSince 'EDID' and 'edid' mean different things in the context of this description for the purpose of clarity I think it would be better to say "the edid pointer address".
Quoted 82 lines
+ * responsible for freeing the edid pointer.
+ */
+
static intdrivers/acpi/acpi_video.c +1
-2-acpi_video_device_EDID(struct acpi_video_device *device, - union acpi_object **edid, int length) +acpi_video_device_EDID(struct acpi_video_device *device, void **edid,int length)
{
- int status;
+acpi_statusstatus;
structacpi_bufferbuffer = {ACPI_ALLOCATE_BUFFER, NULL }; unionacpi_object*obj;
unionacpi_objectarg0 = {ACPI_TYPE_INTEGER}; structacpi_object_listargs = { 1, &arg0 };
-
+ int ret;
*edid = NULL;drivers/acpi/acpi_video.c +11
-18@@ -636,16 +649,17 @@ acpi_video_device_EDID(struct acpi_video_device *device, obj = buffer.pointer; - if (obj && obj->type == ACPI_TYPE_BUFFER) - *edid = obj; - else { + if (obj && obj->type == ACPI_TYPE_BUFFER) { + *edid = kmemdup(obj->buffer.pointer, obj->buffer.length,GFP_KERNEL ); + ret = *edid ? obj->buffer.length : -ENOMEM; + } else { acpi_handle_debug(device->dev->handle, "Invalid _DDC data for length %d\n", length); - status = -EFAULT; - kfree(obj); + ret = -EFAULT; } - return status; + kfree(obj); + return ret; } /* bus */@@ -1435,9 +1449,7 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, { struct acpi_video_bus *video; struct acpi_video_device *video_device; - union acpi_object *buffer = NULL; - acpi_status status; - int i, length; + int i, length, ret; if (!device || !acpi_driver_data(device)) return -EINVAL;@@ -1477,16 +1489,10 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, } for (length = 512; length > 0; length -= 128) { - status = acpi_video_device_EDID(video_device, &buffer, - length); - if (ACPI_SUCCESS(status)) - break; + ret = acpi_video_device_EDID(video_device, edid, length); + if (ret > 0) + return ret; } - if (!length) - continue; - - *edid = buffer->buffer.pointer; - return length; } return -ENODEV;drivers/gpu/drm/nouveau/nouveau_acpi.c +1
-1@@ -384,7 +384,7 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector) if (ret < 0) return NULL; - return kmemdup(edid, EDID_LENGTH, GFP_KERNEL); + return edid; } bool nouveau_acpi_video_backlight_use_native(void)
Re: [PATCH v2] ACPI: video: Fix random crashes due to bad kfree
Quoted 27 lines · Mario Limonciello
Quoted 25 lines · Mario Limonciello
Quoted 13 lines · Chris Bainbridge
Commit
c6a837088bed("drm/amd/display: Fetch the EDID from_DDCif available for eDP") added functiondm_helpers_probe_acpi_edid, which fetches the EDID from the BIOS by callingacpi_video_get_edid.acpi_video_get_edidreturns a pointer to the EDID, but this pointer does not originate from kmalloc - it is actually the internal "pointer" field from anacpi_bufferstruct (which did come from kmalloc).dm_helpers_probe_acpi_edidthen attempts to kfree the EDID pointer, resulting in memory corruption which leads to random, intermittent crashes (e.g. 4% of boots will fail with some Oops).Fix this by allocating a new array (which can be safely freed) for the EDID data, and correctly freeing the
acpi_bufferpointer.Quoted 7 lines
The only other caller of
acpi_video_get_edidisnouveau_acpi_edid:
remove the extraneous kmemdup here as the EDID data is now copied inacpi_video_device_EDID.Signed-off-by Chris Bainbridge <[email protected]>Fixes c6a837088bed ("drm/amd/display: Fetch the EDID from _DDC ifavailable for eDP")
Two minor documentation related comments to consider, otherwise I think the code change looks good. Feel free to include:
Quoted 8 lines
Quoted 1 line
Reviewed-by Mario Limonciello <[email protected]>A few more tags to collate from another thread:
Reported-by Borislav Petkov (AMD) <[email protected]>
Applied as a fix for 6.13, thanks everyone!