Skip to content

Commit c24a423

Browse files
committed
Merge pull request #81 from nowsecure/bug_fix/cve_misnomer
CVE-2015-1474 was misnamed as CVE-2014-1528
2 parents d04fe12 + ae80568 commit c24a423

File tree

5 files changed

+36
-8
lines changed

5 files changed

+36
-8
lines changed

app/src/main/assets/vuln_map.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,25 @@
5252
],
5353
"cvedate": "09/30/2015"
5454
},
55+
"CVE-2015-1474": {
56+
"cve": "CVE-2015-1474",
57+
"altnames": [
58+
],
59+
"description": "Multiple integer overflows in the GraphicBuffer::unflatten function in platform/frameworks/native/libs/ui/GraphicBuffer.cpp in Android through 5.0 allow attackers to gain privileges or cause a denial of service (memory corruption) via vectors that trigger a large number of (1) file descriptors or (2) integer values.",
60+
"impact": "Local unprivileged app to system app escalation + accesible via the network",
61+
"external_links": [
62+
"http://seclists.org/fulldisclosure/2015/Mar/63",
63+
"https://github.com/p1gl3t/CVE-2015-1474_poc",
64+
"https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1474",
65+
"https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-1474"
66+
],
67+
"cvssv2": 9.3,
68+
"patch": [
69+
"https://android.googlesource.com/platform/frameworks/native/+/e6f7a44e835d320593fa33052f35ea52948ff0b2",
70+
"https://android.googlesource.com/platform/frameworks/native/+/796aaf7fb160fea12bddc8406d7f006ce811eb43"
71+
],
72+
"cvedate": "09/30/2015"
73+
},
5574
"JarBug13678484": {
5675
"cve": "JarBug13678484",
5776
"altnames": [

app/src/main/java/fuzion24/device/vulnerability/test/adapter/RecyclerAdapter.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,16 @@
3131
public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
3232

3333
private static final String TAG = "RecycleAdapter";
34-
final private List<Pair<VulnerabilityTestResult, VulnerabilityDescriptor>> mResults;
34+
private List<Pair<VulnerabilityTestResult, VulnerabilityDescriptor>> mResults;
3535
private Context mContext;
3636

3737
public RecyclerAdapter(Context context, List<VulnerabilityTestResult> itemList) {
3838
this.mContext = context;
39+
this.mResults = buildResultDescriptionMap(context, itemList);
40+
}
41+
42+
43+
private static List<Pair<VulnerabilityTestResult, VulnerabilityDescriptor>> buildResultDescriptionMap(Context context, List<VulnerabilityTestResult> itemList){
3944
List<Pair<VulnerabilityTestResult, VulnerabilityDescriptor>> res = new ArrayList<>();
4045

4146
try {
@@ -61,7 +66,14 @@ public int compare(Pair<VulnerabilityTestResult, VulnerabilityDescriptor> lhs, P
6166
}catch(Exception e){
6267
e.printStackTrace();
6368
}
64-
mResults = res;
69+
return res;
70+
71+
}
72+
73+
74+
public void updateResults(List<VulnerabilityTestResult> itemList){
75+
mResults = buildResultDescriptionMap(mContext, itemList);
76+
notifyDataSetChanged();
6577
}
6678

6779
@Override

app/src/main/java/fuzion24/device/vulnerability/test/ui/MainActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
125125
switch (itemId) {
126126
case R.id.menu_export_results:
127127
case R.id.menu_share_results:
128-
if (testResults == null) {
128+
if (testResults == null || testResults.isEmpty()) {
129129
Snackbar.make(coordinatorLayout, R.string.run_tests, Snackbar.LENGTH_LONG).setAction(R.string.start, new View.OnClickListener() {
130130
@Override
131131
public void onClick(View v) {
@@ -206,7 +206,6 @@ private JSONObject serializeResults(List<VulnerabilityTestResult> results, Devic
206206
return combinedResults;
207207
}
208208

209-
210209
private void runTestsSuit() {
211210
new VulnerabilityTestRunner(MainActivity.this, true, new ResultsCallback() {
212211
@Override
@@ -217,7 +216,7 @@ public void finished(final List<VulnerabilityTestResult> results) {
217216
testResults.addAll(results);
218217

219218
emptyView.setVisibility(View.GONE);
220-
recyclerAdapter.notifyDataSetChanged();
219+
recyclerAdapter.updateResults(results);
221220
}
222221
}).execute();
223222
}

app/src/main/java/fuzion24/device/vulnerability/util/DeviceInfo.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ private DeviceInfo(String kVer,
6161
}
6262

6363
public static DeviceInfo getDeviceInfo() {
64-
6564
String kVer = readKernelVersion();
6665
String bManufac = Build.MANUFACTURER;
6766
String bBrand = Build.BRAND;

app/src/main/java/fuzion24/device/vulnerability/vulnerabilities/framework/graphics/GraphicBufferTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public int getIntCode(){
3939

4040
@Override
4141
public String getCVEorID() {
42-
return "CVE-2015-1528";
42+
return "CVE-2015-1474";
4343
}
4444

4545
@Override
@@ -57,7 +57,6 @@ public List<CPUArch> getSupportedArchitectures() {
5757
public boolean isVulnerable(Context context) throws Exception {
5858
int checkVal;
5959

60-
6160
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
6261
Log.d(TAG, "Running with KK and Lollipop types");
6362
checkVal = checkGraphicsBuffer(AndroidVersions.KITKAT_AND_LOLLIPOP.getIntCode());

0 commit comments

Comments
 (0)