diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2016-06-20 17:00:14 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-06-23 15:05:18 -0700 |
| commit | 1f24c730ab6ca5aff1e3137b340b8aeaeda4bdbc (patch) | |
| tree | 240a349e5c0a5e783cd192317d3aa47c935861c2 /camera | |
| parent | b351eabb428c7ca85a34513c64601f437923d576 (diff) | |
| download | frameworks_av-1f24c730ab6ca5aff1e3137b340b8aeaeda4bdbc.zip frameworks_av-1f24c730ab6ca5aff1e3137b340b8aeaeda4bdbc.tar.gz frameworks_av-1f24c730ab6ca5aff1e3137b340b8aeaeda4bdbc.tar.bz2 | |
DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak
Subtract address of a random static object from pointers being routed
through app process.
Bug: 28466701
Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/ICameraRecordingProxy.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/camera/ICameraRecordingProxy.cpp b/camera/ICameraRecordingProxy.cpp index 3dc0ffb..517b64f 100644 --- a/camera/ICameraRecordingProxy.cpp +++ b/camera/ICameraRecordingProxy.cpp @@ -31,6 +31,11 @@ enum { RELEASE_RECORDING_FRAME, }; +uint8_t ICameraRecordingProxy::baseObject = 0; + +size_t ICameraRecordingProxy::getCommonBaseAddress() { + return (size_t)&baseObject; +} class BpCameraRecordingProxy: public BpInterface<ICameraRecordingProxy> { @@ -106,4 +111,3 @@ status_t BnCameraRecordingProxy::onTransact( // ---------------------------------------------------------------------------- }; // namespace android - |