[haiku-commits] haiku: hrev51743 - src/add-ons/kernel/file_systems/packagefs/nodes

  • From: waddlesplash@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 10 Jan 2018 13:26:28 -0500 (EST)

hrev51743 adds 1 changeset to branch 'master'
old head: 6ba5b421a3cf57633ab8e1698127dbccef43987c
new head: 149553d7272187987531e52756a19e85900a5e70
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=149553d72721+%5E6ba5b421a3cf

----------------------------------------------------------------------------

149553d72721: packagefs: ReadAttribute with user_memcpy().

                                   [ Jérôme Duval <jerome.duval@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev51743
Commit:      149553d7272187987531e52756a19e85900a5e70
URL:         http://cgit.haiku-os.org/haiku/commit/?id=149553d72721
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Mon Jan  8 20:44:57 2018 UTC
Committer:   waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Wed Jan 10 18:26:24 2018 UTC

----------------------------------------------------------------------------

1 file changed, 4 insertions(+), 2 deletions(-)
.../file_systems/packagefs/nodes/AutoPackageAttributes.cpp      | 6 ++++--

----------------------------------------------------------------------------

diff --git 
a/src/add-ons/kernel/file_systems/packagefs/nodes/AutoPackageAttributes.cpp 
b/src/add-ons/kernel/file_systems/packagefs/nodes/AutoPackageAttributes.cpp
index ee3cde9d69..9d720bc5e5 100644
--- a/src/add-ons/kernel/file_systems/packagefs/nodes/AutoPackageAttributes.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/nodes/AutoPackageAttributes.cpp
@@ -53,8 +53,10 @@ public:
                if (offset + (off_t)toCopy > size)
                        toCopy = size - offset;
 
-               if (toCopy > 0)
-                       memcpy(buffer, (const uint8*)value + offset, toCopy);
+               if (toCopy > 0 && user_memcpy(buffer, (const uint8*)value + 
offset,
+                       toCopy) < B_OK) {
+                       return B_BAD_ADDRESS;
+               }
 
                *bufferSize = toCopy;
                return B_OK;


Other related posts: