Hash :
18e323ab
Author :
Date :
2018-05-11T16:54:17
D3D11: Fix out-of-range access with robust access. When using a vertex buffer with DYNAMIC usage, with robust buffer access enabled, we would sometimes read out-of-bounds when using very large values for the index range. An unchecked signed addition would overflow and lead to reading a negative offset. Fix this problem by keeping the value size_t whenever possible. Also do clamped casts when converting to a smaller values. Also adds a regression test. Bug: chromium:842028 Change-Id: Ie630ac857c6acfc0bace849a03eebfbaa2fbe89a Reviewed-on: https://chromium-review.googlesource.com/1055928 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
//
// Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// VertexBuffer11.h: Defines the D3D11 VertexBuffer implementation.
#ifndef LIBANGLE_RENDERER_D3D_D3D11_VERTEXBUFFER11_H_
#define LIBANGLE_RENDERER_D3D_D3D11_VERTEXBUFFER11_H_
#include <stdint.h>
#include "libANGLE/renderer/d3d/VertexBuffer.h"
#include "libANGLE/renderer/d3d/d3d11/ResourceManager11.h"
namespace rx
{
class Renderer11;
class VertexBuffer11 : public VertexBuffer
{
public:
explicit VertexBuffer11(Renderer11 *const renderer);
gl::Error initialize(unsigned int size, bool dynamicUsage) override;
// Warning: you should ensure binding really matches attrib.bindingIndex before using this
// function.
gl::Error storeVertexAttributes(const gl::VertexAttribute &attrib,
const gl::VertexBinding &binding,
GLenum currentValueType,
GLint start,
size_t count,
GLsizei instances,
unsigned int offset,
const uint8_t *sourceData) override;
unsigned int getBufferSize() const override;
gl::Error setBufferSize(unsigned int size) override;
gl::Error discard() override;
void hintUnmapResource() override;
const d3d11::Buffer &getBuffer() const;
private:
~VertexBuffer11() override;
gl::Error mapResource();
Renderer11 *const mRenderer;
d3d11::Buffer mBuffer;
unsigned int mBufferSize;
bool mDynamicUsage;
uint8_t *mMappedResourceData;
};
} // namespace rx
#endif // LIBANGLE_RENDERER_D3D_D3D11_VERTEXBUFFER11_H_