b7ef7e7aff
There is a race in the very_long_name_35166374 test of property_service. The test first sends a size value that is beyond the limit that init will handle, then sends a dummy data value. However, init closes the socket upon seeing the faulty size, and if this happens before the test sends the dummy data, the test will crash due to SIGPIPE. Since there is no reason to send the dummy data at all, this change no longer sends it to prevent the crash. It also now checks explicitly that init returns an error through the socket. Bug: 73619375 Test: the unit test in question Change-Id: I2565a69fa54910cee0e15fc798445e18c91156ec
73 lines
2.9 KiB
C++
73 lines
2.9 KiB
C++
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/un.h>
|
|
|
|
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
|
|
#include <sys/_system_properties.h>
|
|
|
|
#include <android-base/properties.h>
|
|
#include <gtest/gtest.h>
|
|
|
|
using android::base::SetProperty;
|
|
|
|
namespace android {
|
|
namespace init {
|
|
|
|
TEST(property_service, very_long_name_35166374) {
|
|
// Connect to the property service directly...
|
|
int fd = socket(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0);
|
|
ASSERT_NE(fd, -1);
|
|
|
|
static const char* property_service_socket = "/dev/socket/" PROP_SERVICE_NAME;
|
|
sockaddr_un addr = {};
|
|
addr.sun_family = AF_LOCAL;
|
|
strlcpy(addr.sun_path, property_service_socket, sizeof(addr.sun_path));
|
|
|
|
socklen_t addr_len = strlen(property_service_socket) + offsetof(sockaddr_un, sun_path) + 1;
|
|
ASSERT_NE(connect(fd, reinterpret_cast<sockaddr*>(&addr), addr_len), -1);
|
|
|
|
// ...so we can send it a malformed request.
|
|
uint32_t msg = PROP_MSG_SETPROP2;
|
|
uint32_t size = 0xffffffff;
|
|
|
|
ASSERT_EQ(static_cast<ssize_t>(sizeof(msg)), send(fd, &msg, sizeof(msg), 0));
|
|
ASSERT_EQ(static_cast<ssize_t>(sizeof(size)), send(fd, &size, sizeof(size), 0));
|
|
uint32_t result = 0;
|
|
ASSERT_EQ(static_cast<ssize_t>(sizeof(result)),
|
|
TEMP_FAILURE_RETRY(recv(fd, &result, sizeof(result), MSG_WAITALL)));
|
|
EXPECT_EQ(static_cast<uint32_t>(PROP_ERROR_READ_DATA), result);
|
|
ASSERT_EQ(0, close(fd));
|
|
}
|
|
|
|
TEST(property_service, non_utf8_value) {
|
|
ASSERT_TRUE(SetProperty("property_service_utf8_test", "base_success"));
|
|
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\x80"));
|
|
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xC2\x01"));
|
|
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xE0\xFF"));
|
|
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xE0\xA0\xFF"));
|
|
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xF0\x01\xFF"));
|
|
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xF0\x90\xFF"));
|
|
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xF0\x90\x80\xFF"));
|
|
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xF0\x90\x80"));
|
|
EXPECT_FALSE(SetProperty("property_service_utf8_test", "ab\xF0\x90\x80\x80qe\xF0\x90\x80"));
|
|
EXPECT_TRUE(SetProperty("property_service_utf8_test", "\xF0\x90\x80\x80"));
|
|
}
|
|
|
|
} // namespace init
|
|
} // namespace android
|