Attachment #245957 for bug #141206

View Details Raw Unified Return to Bug 141206



2015-02-03  Michael Catanzaro  <mcatanzaro@igalia.com>

        Build with seccomp filters broken since r179409
        https://bugs.webkit.org/show_bug.cgi?id=141206

        Reviewed by NOBODY (OOPS!).

        Fix build by renaming SeccompBrokerClient::shared to SeccompBrokerClient::singleton.

        * Shared/linux/SeccompFilters/SeccompBroker.cpp:
        (WebKit::SeccompBrokerClient::singleton):
        (WebKit::SeccompBroker::initialize):
        (WebKit::SeccompBrokerClient::shared):
        (WebKit::SeccompBroker::runLoop):

2015-01-04  Michael Catanzaro  <mcatanzaro@igalia.com>

        [GTK] Add seccomp filters support




class SeccompBrokerClient {
public:
    static SeccompBrokerClient& singleton(int socket = -1);
    ~SeccompBrokerClient();

    void dispatch(Syscall*) const;

        CRASH();
}

SeccompBrokerClient& SeccompBrokerClient::singleton(int socket)
{
    DEPRECATED_DEFINE_STATIC_LOCAL(SeccompBrokerClient, brokerClient, (socket));


    pid_t pid = fork();
    if (pid) { // Sandboxed process.
        close(sockets[1]);
        SeccompBrokerClient::singleton(sockets[0]);
        registerSIGSYSHandler();
    } else { // Broker.
        // TODO: The broker should setup seccomp filters

Return to Bug 141206

Lines 51-57 namespace WebKit { a/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp_sec1
- a/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp -3 / +3 lines
51		51
52	class SeccompBrokerClient {	52	class SeccompBrokerClient {
53	public:	53	public:
54	static SeccompBrokerClient& shared(int socket = -1);	54	static SeccompBrokerClient& singleton(int socket = -1);
55	~SeccompBrokerClient();	55	~SeccompBrokerClient();
56		56
57	void dispatch(Syscall*) const;	57	void dispatch(Syscall*) const;
Lines 177-183 static void registerSIGSYSHandler() a/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp_sec2
177	CRASH();	177	CRASH();
178	}	178	}
179		179
180	SeccompBrokerClient& SeccompBrokerClient::shared(int socket)	180	SeccompBrokerClient& SeccompBrokerClient::singleton(int socket)
181	{	181	{
182	DEPRECATED_DEFINE_STATIC_LOCAL(SeccompBrokerClient, brokerClient, (socket));	182	DEPRECATED_DEFINE_STATIC_LOCAL(SeccompBrokerClient, brokerClient, (socket));
183		183
Lines 306-312 void SeccompBroker::initialize() a/Source/WebKit2/Shared/linux/SeccompFilters/SeccompBroker.cpp_sec3
306	pid_t pid = fork();	306	pid_t pid = fork();
307	if (pid) { // Sandboxed process.	307	if (pid) { // Sandboxed process.
308	close(sockets[1]);	308	close(sockets[1]);
309	SeccompBrokerClient::shared(sockets[0]);	309	SeccompBrokerClient::singleton(sockets[0]);
310	registerSIGSYSHandler();	310	registerSIGSYSHandler();
311	} else { // Broker.	311	} else { // Broker.
312	// TODO: The broker should setup seccomp filters	312	// TODO: The broker should setup seccomp filters

Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
- a/Source/WebKit2/ChangeLog +15 lines
		1	2015-02-03 Michael Catanzaro <mcatanzaro@igalia.com>
		2
		3	Build with seccomp filters broken since r179409
		4	https://bugs.webkit.org/show_bug.cgi?id=141206
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Fix build by renaming SeccompBrokerClient::shared to SeccompBrokerClient::singleton.
		9
		10	* Shared/linux/SeccompFilters/SeccompBroker.cpp:
		11	(WebKit::SeccompBrokerClient::singleton):
		12	(WebKit::SeccompBroker::initialize):
		13	(WebKit::SeccompBrokerClient::shared):
		14	(WebKit::SeccompBroker::runLoop):
		15
1	2015-01-04 Michael Catanzaro <mcatanzaro@igalia.com>	16	2015-01-04 Michael Catanzaro <mcatanzaro@igalia.com>
2		17
3	[GTK] Add seccomp filters support	18	[GTK] Add seccomp filters support