summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrik Ryd <patrik.ryd@linaro.org>2011-08-08 14:32:24 +0200
committerPatrik Ryd <patrik.ryd@linaro.org>2011-08-08 14:32:24 +0200
commit119e194d52621f51892a0c7397f11637c0a5ec69 (patch)
tree05402fc08dd266d1647c521b201331a257c7ce72
parent21d39989c4b9aa5707a779265a2783aa6c2e5677 (diff)
parent93f032122f0d45d565f899cc4c8f229e4ee27e89 (diff)
downloadvold-linaro_android_2.3.5.tar.gz
Merge commit 'android-2.3.5_r1' into linaro_android_2.3.5linaro_android_2.3.7linaro_android_2.3.5
-rw-r--r--DirectVolume.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/DirectVolume.cpp b/DirectVolume.cpp
index ce5b892d..0ac1a0c9 100644
--- a/DirectVolume.cpp
+++ b/DirectVolume.cpp
@@ -186,6 +186,11 @@ void DirectVolume::handlePartitionAdded(const char *devpath, NetlinkEvent *evt)
part_num = 1;
}
+ if (part_num > MAX_PARTITIONS || part_num < 1) {
+ SLOGW("Invalid 'PARTN' value");
+ part_num = 1;
+ }
+
if (part_num > mDiskNumParts) {
mDiskNumParts = part_num;
}