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.

Sign up for GitHub

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

Jump to bottom

Import w8001 patch from upstream #419

Merged
merged 2 commits into from
May 7, 2024
Merged

Import w8001 patch from upstream #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dbad44
Input: move from strlcpy with unused retval to strscpy
Aug 18, 2022
e83a9bb
github: Temporarily set -Wno-error=unused-result to bypass upstream w…
jigpu May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@ jobs:
compile_cflags: -fno-pie -Wno-error=format-truncation
prepare_cflags: -fno-pie -no-pie
- kernel: "4.5"
compile_cflags: -fno-pie -Wno-error=format-truncation -Wno-error=pointer-sign
compile_cflags: -fno-pie -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result
prepare_cflags: -fno-pie -no-pie
- kernel: "4.6"
compile_cflags: -fno-pie -Wno-error=format-truncation -Wno-error=pointer-sign
compile_cflags: -fno-pie -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result
prepare_cflags: -fno-pie -no-pie
- kernel: "4.10"
compile_cflags: -fno-pie -Wno-error=format-truncation -Wno-error=pointer-sign
compile_cflags: -fno-pie -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result
prepare_cflags: -fno-pie -no-pie
- kernel: "4.14"
compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result
- kernel: "4.19"
compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result
- kernel: "5.10"
compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result
- kernel: "6.3"
compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign -Wno-error=unused-result
build_makeflags: KBUILD_MODPOST_WARN=1
steps:
- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions 4.5/wacom_w8001.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
/* For backwards-compatibility we compose the basename based on
* capabilities and then just append the tool type
*/
strlcpy(basename, "Wacom Serial", sizeof(basename));
strscpy(basename, "Wacom Serial", sizeof(basename));

err_pen = w8001_setup_pen(w8001, basename, sizeof(basename));
err_touch = w8001_setup_touch(w8001, basename, sizeof(basename));
Expand All @@ -635,7 +635,7 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
}

if (!err_pen) {
strlcpy(w8001->pen_name, basename, sizeof(w8001->pen_name));
strscpy(w8001->pen_name, basename, sizeof(w8001->pen_name));
strlcat(w8001->pen_name, " Pen", sizeof(w8001->pen_name));
input_dev_pen->name = w8001->pen_name;

Expand All @@ -651,7 +651,7 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
}

if (!err_touch) {
strlcpy(w8001->touch_name, basename, sizeof(w8001->touch_name));
strscpy(w8001->touch_name, basename, sizeof(w8001->touch_name));
strlcat(w8001->touch_name, " Finger",
sizeof(w8001->touch_name));
input_dev_touch->name = w8001->touch_name;
Expand Down
Loading