diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-11-12 14:20:06 -0800 |
|---|---|---|
| committer | Mike Lockwood <lockwood@google.com> | 2014-11-12 16:08:37 -0800 |
| commit | ab063847e6e893740749029a04cce1f6b7345ed5 (patch) | |
| tree | 8b840e9152cfa638aa354a0379962a89914e0006 /media/mtp/MtpRequestPacket.h | |
| parent | 745602d87607521f4fe84c4f3a6388fbdb6a867c (diff) | |
| download | frameworks_av-ab063847e6e893740749029a04cce1f6b7345ed5.zip frameworks_av-ab063847e6e893740749029a04cce1f6b7345ed5.tar.gz frameworks_av-ab063847e6e893740749029a04cce1f6b7345ed5.tar.bz2 | |
MTP: add strict bounds checking for all incoming packets
Previously we did not sanity check incoming MTP packets,
which could result in crashes due to reading off the edge of a packet.
Now all MTP packet getter functions return a boolean result
(true for OK, false for reading off the edge of the packet)
and we now return errors for malformed packets.
Bug: 18113092
Change-Id: Ic7623ee96f00652bdfb4f66acb16a93db5a1c105
Diffstat (limited to 'media/mtp/MtpRequestPacket.h')
| -rw-r--r-- | media/mtp/MtpRequestPacket.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/mtp/MtpRequestPacket.h b/media/mtp/MtpRequestPacket.h index 1201f11..79b798d 100644 --- a/media/mtp/MtpRequestPacket.h +++ b/media/mtp/MtpRequestPacket.h @@ -43,6 +43,10 @@ public: inline MtpOperationCode getOperationCode() const { return getContainerCode(); } inline void setOperationCode(MtpOperationCode code) { return setContainerCode(code); } + inline int getParameterCount() const { return mParameterCount; } + +private: + int mParameterCount; }; }; // namespace android |