i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeon_hd: Add additional sanity checks

Browse Source 
* Prevents negative array index read (again)
* Clear display_mode struct before lvds read - CID 1108403
This commit is contained in:
Alexander von Gluck IV
2014-11-15 09:25:40 -06:00
parent 6a716f63ae
commit a9327b1110
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/connector.cpp
+9 -1
View File
@@ -9,6 +9,7 @@
#include "connector.h" #include "connector.h"
#include <assert.h>
#include <Debug.h> #include <Debug.h>
#include "accelerant_protos.h" #include "accelerant_protos.h"
@@ -152,6 +153,8 @@ connector_read_edid(uint32 connectorIndex, edid1_info* edid)
bool bool
connector_read_mode_lvds(uint32 connectorIndex, display_mode* mode) connector_read_mode_lvds(uint32 connectorIndex, display_mode* mode)
{ {
assert(mode);
uint8 dceMajor; uint8 dceMajor;
uint8 dceMinor; uint8 dceMinor;
int index = GetIndexIntoMasterTable(DATA, LVDS_Info); int index = GetIndexIntoMasterTable(DATA, LVDS_Info);
@@ -162,6 +165,9 @@ connector_read_mode_lvds(uint32 connectorIndex, display_mode* mode)
struct _ATOM_LVDS_INFO_V12 info_12; struct _ATOM_LVDS_INFO_V12 info_12;
}; };
// Wipe out display_mode
memset(mode, 0, sizeof(display_mode));
if (atom_parse_data_header(gAtomContext, index, NULL, if (atom_parse_data_header(gAtomContext, index, NULL,
&dceMajor, &dceMinor, &offset) == B_OK) { &dceMajor, &dceMinor, &offset) == B_OK) {
@@ -379,8 +385,10 @@ gpio_i2c_populate()
break; break;
} }
} }
if (gpioIndex < 0) if (gpioIndex < 0) {
ERROR("%s: ERROR: Out of space for additional GPIO pins!\n", __func__); ERROR("%s: ERROR: Out of space for additional GPIO pins!\n", __func__);
return B_ERROR;
}
for (uint32 i = 0; i < numIndices; i++) { for (uint32 i = 0; i < numIndices; i++) {
if (gGPIOInfo[gpioIndex]->valid) { if (gGPIOInfo[gpioIndex]->valid) {