Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] chromium: update to 89.0.4389.72 #29205

Closed
wants to merge 1 commit into from

Conversation

pullmoll
Copy link
Member

@pullmoll pullmoll commented Mar 3, 2021

CVE-2021-21166

  • x86_64 patch set updated, built, tested very cursory and seems to work
  • i686 patch applies w/o change, built, cursory test in a VM
  • x86_64-musl patch set updated, built, works but can crash, see comments below
  • system opus disabled because the generated shim header opus.h tries to include <opus.h> and fails
  • not sure if libc_malloc.patch is ok, i.e. simply use malloc() instead of __libc_malloc().
  • more to do

[ci skip]

If you don't want to build yourself my repo has the update for testing.

@pullmoll pullmoll force-pushed the chromium branch 4 times, most recently from 070d16e to 4f66c5c Compare March 3, 2021 16:49
@pullmoll
Copy link
Member Author

pullmoll commented Mar 3, 2021

Not sure if the x86_64-musl syscall crash is because of me already using musl-1.2.2.
I'll check to see what syscall 0324 is and what to do about it.

I suppose it's 324 __NR_membarrier and not 0324 (octal) as printed in the crash log.

Edit: I need to partially restore the sandbox-membarrier.patch. The #if !defined(_NR_membarrier) are now in the headers while the case _NR_membarrier: is missing in syscall_sets.cc.

@ericonr
Copy link
Member

ericonr commented Mar 3, 2021

Do you have it in your repository for musl? The current version doesn't crash on musl 1.2.1, at least. I haven't updated to 1.2.2 because it breaks Firefox seccomp (Firefox needs to be built for musl 1.2.2), so it could perhaps be the same situation.

@pullmoll
Copy link
Member Author

pullmoll commented Mar 3, 2021

@ericonr You can get it from https://repo.voidlinux.de/binpkgs/chromium-89.0.4389.72_1.x86_64-musl.xbps already, the x86_64-musl/... is not yet updated because a lot of live/... files are before that.
But see above. I think I removed an important part of a patch that failed.
I'll rebuild x86_64-musl with that.

@pullmoll
Copy link
Member Author

pullmoll commented Mar 3, 2021

Updated: patches/sandbox-membarrier.patch now just adds the case _NR_membarrier: line and I'm rebuilding x86_64-musl now.

Status update: x86_64-musl does not immediately crash but soon after when viewing a website:
libva error: vaGetDriverByNameIndex() failed with unknown libva error, driver name = (null)
https://voidlinux.org/ shows and does not crash... this requires further investigation :-(

@q66
Copy link
Contributor

q66 commented Mar 3, 2021

why are you removing patches that apply? (e.g. no-getcontext.patch, the libc_malloc.patch should probably stay as well, etc)

xxx-ppc64le-support.patch just needs a trivial 5-minute rebase so idk why you're removing it https://gist.github.com/q66/3b7ec52349d4d7390456e3f10726b38f (but i did it myself since i don't trust anyone else not to mess it up)

you'll find that xxx-ppc64le-support.patch in musl patches then applies cleanly, without removing any of it (i.e. revert your changes to it)

@pullmoll
Copy link
Member Author

pullmoll commented Mar 3, 2021

@q66 This is WIP and I didn't claim it was finished. You're welcome to help or, if you so desire, take over what I started :-P Took your updated xxx-ppc64le-musl.patch and restored the one in musl-patches...

Oh, and the previous libc_malloc.patch does not compile.

@q66
Copy link
Contributor

q66 commented Mar 3, 2021

well I'm not expecting it to be finished, i'm just saying the patches tend to depend on each other, so by making patches later in the sequence apply after removing patches earlier in the sequence is just wasting your time (and may result in bugs being introduced by accident)

CVE-2021-21166
Disable Widevine CDM component updater (Debian patch)

[ci skip]
@q66 q66 mentioned this pull request Mar 10, 2021
3 tasks
@q66 q66 closed this in 6e251d9 Mar 11, 2021
hazayan pushed a commit to hazayan/void-packages that referenced this pull request Mar 27, 2021
- Built for x86_64, x86_64-musl, i686.
- Tested on x86_64.

- Use pipewire 0.3 (default in 90).
- Remove Google API client id and secret.
- Video acceleration is now a feature that must be enabled in
  chrome://flags.

changes by q66: updated ppc64le patches

Closes: void-linux#29205
Closes: void-linux#29384
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 10, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants