aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-06-26fix memleak on background cmd errorael-code
- src must be free after join_args() - wordfree must bee used after wordexp
2018-06-26Merge pull request #2163 from martinetd/use-after-freeRyan Dwyer
layer shell: fix some use after free on destroy
2018-06-26layer_shell: order destroying before sway_outputDominique Martinet
Both sway_output and sway_layer_shell listen to wlr's output destroy event, but sway_layer_shell needs to access into sway_output's data strucure and needs to be destroyed first. Resolve this by making sway_layer_shell listen to a new event that happens at start of sway_output's destroy handler
2018-06-26layer_shell: cleanup output link on output destroyDominique Martinet
Fixes this kind of use-after-free: ==1795==ERROR: AddressSanitizer: heap-use-after-free on address 0x612000191ef0 at pc 0x00000048c388 bp 0x7ffe308f0410 sp 0x7ffe308f0400 WRITE of size 8 at 0x612000191ef0 thread T0 #0 0x48c387 in wl_list_remove ../common/list.c:157 #1 0x42196b in handle_destroy ../sway/desktop/layer_shell.c:275 #2 0x7f55cc2549fa in wlr_signal_emit_safe ../util/signal.c:29 #3 0x7f55cc22cf68 in layer_surface_destroy ../types/wlr_layer_shell.c:182 #4 0x7f55cc22d084 in layer_surface_resource_destroy ../types/wlr_layer_shell.c:196 #5 0x7f55cc4ca025 in destroy_resource src/wayland-server.c:688 #6 0x7f55cc4ca091 in wl_resource_destroy src/wayland-server.c:705 #7 0x7f55cc22c3a2 in resource_handle_destroy ../types/wlr_layer_shell.c:18 #8 0x7f55c8ef103d in ffi_call_unix64 (/lib64/libffi.so.6+0x603d) #9 0x7f55c8ef09fe in ffi_call (/lib64/libffi.so.6+0x59fe) #10 0x7f55cc4cdf2c (/lib64/libwayland-server.so.0+0xbf2c) #11 0x7f55cc4ca3de in wl_client_connection_data src/wayland-server.c:420 #12 0x7f55cc4cbf01 in wl_event_loop_dispatch src/event-loop.c:641 #13 0x7f55cc4ca601 in wl_display_run src/wayland-server.c:1260 #14 0x40bb1e in server_run ../sway/server.c:141 #15 0x40ab2f in main ../sway/main.c:432 #16 0x7f55cb97318a in __libc_start_main ../csu/libc-start.c:308 #17 0x408d29 in _start (/opt/wayland/bin/sway+0x408d29) 0x612000191ef0 is located 48 bytes inside of 312-byte region [0x612000191ec0,0x612000191ff8) freed by thread T0 here: #0 0x7f55ce3bb880 in __interceptor_free (/lib64/libasan.so.5+0xee880) #1 0x42f1db in handle_destroy ../sway/desktop/output.c:1275 #2 0x7f55cc2549fa in wlr_signal_emit_safe ../util/signal.c:29 #3 0x7f55cc23b4c2 in wlr_output_destroy ../types/wlr_output.c:284 #4 0x7f55cc1ddc20 in xdg_toplevel_handle_close ../backend/wayland/output.c:235 #5 0x7f55c8ef103d in ffi_call_unix64 (/lib64/libffi.so.6+0x603d) previously allocated by thread T0 here: #0 0x7f55ce3bbe50 in calloc (/lib64/libasan.so.5+0xeee50) #1 0x42f401 in handle_new_output ../sway/desktop/output.c:1308 #2 0x7f55cc2549fa in wlr_signal_emit_safe ../util/signal.c:29 #3 0x7f55cc1d6cbf in new_output_reemit ../backend/multi/backend.c:113 #4 0x7f55cc2549fa in wlr_signal_emit_safe ../util/signal.c:29 #5 0x7f55cc1deac7 in wlr_wl_output_create ../backend/wayland/output.c:327 #6 0x7f55cc1db353 in backend_start ../backend/wayland/backend.c:55 #7 0x7f55cc1bad55 in wlr_backend_start ../backend/backend.c:35 #8 0x7f55cc1d67a0 in multi_backend_start ../backend/multi/backend.c:24 #9 0x7f55cc1bad55 in wlr_backend_start ../backend/backend.c:35 #10 0x40ba8a in server_run ../sway/server.c:136 #11 0x40ab2f in main ../sway/main.c:432 #12 0x7f55cb97318a in __libc_start_main ../csu/libc-start.c:308
2018-06-24Merge pull request #2159 from acrisci/focus-dont-follow-keyboard-grabDrew DeVault
dont focus-follow-mouse when keyboard grab
2018-06-24dont focus-follow-mouse when keyboard grabTony Crisci
2018-06-22Merge pull request #2155 from ael-code/fix_output_command_failureDrew DeVault
bugfix: avoid access after free
2018-06-22bugfix: avoid access after freeael-code
if src is NULL due to a previous error we cannot use it in the command result string. Moreover if `src` points to `p.we_wordv[0]` we cannot use it after `wordfree(&p)` in the command result string. Bonus feature: If there was an error accessing the file, the string rapresentation of the error is now included in the command result string.
2018-06-22Merge pull request #2146 from ↵Drew DeVault
tobiasblass/prepare_server_before_dropping_privileges Perform (partial) server initialization before dropping privileges.
2018-06-22Merge pull request #2152 from atomnuker/masteremersion
Init the dmabuf exporting protocol in wlroots
2018-06-22Init the dmabuf exporting protocol in wlrootsRostislav Pehlivanov
Allows desktop capture via the dmabuf-capture wlroots example client.
2018-06-19Perform (partial) server initialization before dropping privileges.Tobias Blass
Some operations during backend creation (e.g. becoming DRM master) require CAP_SYS_ADMIN privileges. At this point, sway has dropped them already, though. This patch splits the privileged part of server_init into its own function and calls it before dropping its privileges. This fixes the bug with minimal security implications.
2018-06-17Merge pull request #2143 from vilhalmer/mark-pool-buffers-busyDrew DeVault
Set pool_buffers busy when handing them out
2018-06-17Merge branch 'master' into mark-pool-buffers-busyvil
2018-06-17Set pool_buffers busy when handing them outvilhalmer
2018-06-17Merge pull request #2140 from Hello71/patch-2Drew DeVault
swayidle: fix stack overflow on sleep
2018-06-17swayidle: fix stack overflow on sleepAlex Xu (Hello71)
2018-06-16Merge pull request #2135 from emersion/wlroots-1060Drew DeVault
Update for swaywm/wlroots#1060
2018-06-16Update for swaywm/wlroots#1060emersion
2018-06-13Merge pull request #2130 from frsfnrrg/keyboard-tuningDrew DeVault
Clean up keyboard handling code
2018-06-12Fix keyboard shortcut handling inconsistenciesfrsfnrrg
* Ensure that modifier keys are identified even when the next key does not produce a keysym. This requires that modifier change tracking be done for each sway_shortcut_state. * Permit regular and --release shortcuts on the same key combination. Distinct bindings are identified for press and release cases; note that the release binding needs to be identified for both key press and key release events. * Maintain ascending sort order for the shortcut state list, and keep track of the number of pressed key ids, for simpler (and hence faster) searching of the list of key bindings. * Move binding duplicate detection into get_active_binding to avoid duplicating error messages.
2018-06-12Sort binding key listsfrsfnrrg
Sort the list comprising the set of keys for the binding in ascending order. (Keyboard shortcuts depend only on the set of simultaneously pressed keys, not their order, so this change should have no external effect.) This simplifies comparisons between bindings.
2018-06-09Merge pull request #2124 from emersion/drag-iconsDrew DeVault
Render drag icons
2018-06-09Merge pull request #2047 from natesymer/masterDrew DeVault
Implement Gaps
2018-06-09Implement gaps (PR #2047)Nate Symer
2018-06-09Render drag iconsemersion
2018-06-09Merge pull request #2123 from emersion/fix-disabled-outputsemersion
Fix compilation errors related to disabled outputs
2018-06-09Fix compilation errors related to disabled outputsemersion
2018-06-09Merge pull request #2115 from RedSoxFan/restore-workspacesRyan Dwyer
Restore workspaces to output when re-enabled
2018-06-08Switch restore workspaces to a nested for-loopBrian Ashworth
2018-06-08Restore workspaces to outputs based on priorityBrian Ashworth
2018-06-08Merge pull request #2121 from martinetd/swaylock-ctrl-uemersion
swaylock: implement ^U to clear buffer
2018-06-08swaylock: implement ^U to clear bufferDominique Martinet
The whole state->xcb.modifiers thing didn't work at all (always 0) The xkb doc says "[xkb_state_serialize_mods] should not be used in regular clients; please use the xkb_state_mod_*_is_active API instead" so here it is
2018-06-08Merge pull request #2119 from martinetd/gcc-strtruncationemersion
sway/criteria: gcc string truncation warning fix
2018-06-08Merge pull request #2120 from martinetd/swayidle-zombiesemersion
Swayidle: doublefork to not leave zombies around
2018-06-08sway/criteria: gcc string truncation warning fixDominique Martinet
2018-06-08sway exec command: use waitpid instead of waitDominique Martinet
2018-06-08swayidle: doublefork to not leave zombies aroundDominique Martinet
2018-06-08Merge pull request #2118 from RedSoxFan/fix-2117emersion
Remove strip quoting and fix strncpy-overlap
2018-06-07Remove strip quoting and fix strncpy-overlapBrian Ashworth
2018-06-07Merge pull request #2084 from RedSoxFan/runtime-var-expansionemersion
Runtime variable expansion
2018-06-07Merge pull request #2108 from RedSoxFan/store-outputsemersion
Allow outputs to be re-enabled
2018-06-06Switch output storing from list_t to wl_listBrian Ashworth
2018-06-06Address emersions comments on output re-enablingBrian Ashworth
2018-06-06Store sway_outputs so that they can be reenabledBrian Ashworth
2018-06-07Merge pull request #2116 from RedSoxFan/fix-2113Ryan Dwyer
Fix focusing after splitting tabs/stacks
2018-06-06Remove tab/stack check for focusing after a splitBrian Ashworth
2018-06-06Fix focusing after splitting tabs/stacksBrian Ashworth
2018-06-06Merge pull request #2110 from smlx/initialise-cursor-previousemersion
Initialise previous cursor position.
2018-06-06Initialise previous cursor position.Scott Leggett
Fix the problem with focus jumping to the container under the cursor when first starting sway.