diff options
author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 01:33:49 +0000 |
---|---|---|
committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 01:33:49 +0000 |
commit | c27e411de097d9da503f6d122e9df1083938ee45 (patch) | |
tree | b566ab36d113faeb2c7379e72e903ab705699049 | |
parent | 21e743205216812e6ca165313b7999f94f0fdc3e (diff) | |
download | chromium_src-c27e411de097d9da503f6d122e9df1083938ee45.zip chromium_src-c27e411de097d9da503f6d122e9df1083938ee45.tar.gz chromium_src-c27e411de097d9da503f6d122e9df1083938ee45.tar.bz2 |
Returns an error immediately without sending IPC message when a font family name to resolve is too long.
This change is important when a site has @font-face rule like:
// http://paulirish.com/webkit-fontface-hang.html
@font-face{font-family:testfont;src:url('data:font/ttf;base64,AA.....<<looooooooooong base64 data>>.....aQ==')}
In such a case, WebCore first calls SkFontHost::CreateTypeface() with the (possibly very long) data-uri string itself, then calls SkFontHost::CreateTypefaceFromStream() with decoded byte stream. Since render_sandbox_host_linux.cc just ignores too long IPC message, the renderer process could block indefinitely waiting for a reply inside recvmsg() system call called from SkFontHost::CreateTypeface().
I'm not sure if the WebCore behavior (i.e. calling CreateTypeface with data-uris) is reasonable, but I believe the Skia part is better to be fixed anyway. Non data-uri font family names could be very long too:
@font-face{font-family:testfont;src:local('AA........AA');}
BUG=29861
TEST=First, set up your Linux SUID Sandbox binary: http://code.google.com/p/chromium/wiki/LinuxSUIDSandboxDevelopment. Then start Chromium and visit http://paulirish.com/webkit-fontface-hang.html or http://typekit.com/. Verify that the renderer does not freeze.
Review URL: http://codereview.chromium.org/507037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34915 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/renderer_host/render_sandbox_host_linux.cc | 15 | ||||
-rw-r--r-- | skia/ext/SkFontHost_fontconfig_direct.cpp | 3 | ||||
-rw-r--r-- | skia/ext/SkFontHost_fontconfig_impl.h | 5 | ||||
-rw-r--r-- | skia/ext/SkFontHost_fontconfig_ipc.cpp | 3 |
4 files changed, 22 insertions, 4 deletions
diff --git a/chrome/browser/renderer_host/render_sandbox_host_linux.cc b/chrome/browser/renderer_host/render_sandbox_host_linux.cc index f1c3b03..2e89799 100644 --- a/chrome/browser/renderer_host/render_sandbox_host_linux.cc +++ b/chrome/browser/renderer_host/render_sandbox_host_linux.cc @@ -100,11 +100,20 @@ class SandboxIPCProcess { void HandleRequestFromRenderer(int fd) { std::vector<int> fds; - static const unsigned kMaxMessageLength = 2048; - char buf[kMaxMessageLength]; + + // A FontConfigIPC::METHOD_MATCH message could be kMaxFontFamilyLength + // bytes long (this is the largest message type). + // 128 bytes padding are necessary so recvmsg() does not return MSG_TRUNC + // error for a maximum length message. + char buf[FontConfigInterface::kMaxFontFamilyLength + 128]; + const ssize_t len = base::RecvMsg(fd, buf, sizeof(buf), &fds); - if (len == -1) + if (len == -1) { + // TODO: should send an error reply, or the sender might block forever. + NOTREACHED() + << "Sandbox host message is larger than kMaxFontFamilyLength"; return; + } if (fds.size() == 0) return; diff --git a/skia/ext/SkFontHost_fontconfig_direct.cpp b/skia/ext/SkFontHost_fontconfig_direct.cpp index 3f19fc7..9434f51 100644 --- a/skia/ext/SkFontHost_fontconfig_direct.cpp +++ b/skia/ext/SkFontHost_fontconfig_direct.cpp @@ -46,6 +46,9 @@ bool FontConfigDirect::Match(std::string* result_family, bool fileid_valid, unsigned fileid, const std::string& family, bool* is_bold, bool* is_italic) { + if (family.length() > kMaxFontFamilyLength) + return false; + SkAutoMutexAcquire ac(mutex_); FcPattern* pattern = FcPatternCreate(); diff --git a/skia/ext/SkFontHost_fontconfig_impl.h b/skia/ext/SkFontHost_fontconfig_impl.h index f3b4b41..d2f1d5d 100644 --- a/skia/ext/SkFontHost_fontconfig_impl.h +++ b/skia/ext/SkFontHost_fontconfig_impl.h @@ -38,7 +38,8 @@ class FontConfigInterface { * @param fileid the fileid (as returned by this function) which we are * trying to match. * @param family (optional) the family of the font that we are trying to - * match. + * match. If the length of the |family| is greater then + * kMaxFontFamilyLength, this function should immediately return false. * @param is_bold (optional, set to NULL to ignore, in/out) * @param is_italic (optional, set to NULL to ignore, in/out) * @return true iff successful. @@ -55,6 +56,8 @@ class FontConfigInterface { /** Open a font file given the fileid as returned by Match */ virtual int Open(unsigned fileid) = 0; + + static const unsigned kMaxFontFamilyLength = 2048; }; #endif // FontConfigInterface_DEFINED diff --git a/skia/ext/SkFontHost_fontconfig_ipc.cpp b/skia/ext/SkFontHost_fontconfig_ipc.cpp index ada7bc9..01bd393 100644 --- a/skia/ext/SkFontHost_fontconfig_ipc.cpp +++ b/skia/ext/SkFontHost_fontconfig_ipc.cpp @@ -41,6 +41,9 @@ bool FontConfigIPC::Match(std::string* result_family, bool fileid_valid, unsigned fileid, const std::string& family, bool* is_bold, bool* is_italic) { + if (family.length() > kMaxFontFamilyLength) + return false; + Pickle request; request.WriteInt(METHOD_MATCH); request.WriteBool(fileid_valid); |