Commit Graph

649487 Commits

Author SHA1 Message Date
Luke go
5142ba2ec7 ODROID-COMMON: arm64/dts: Disabled sdio.
Change-Id: I0ed353e5275bc71a667313e036d0a77c7d1e4875
2020-12-18 12:41:19 +09:00
Chris
8d2a1e3626 ODROID-G12: Add CONFIG_KEYBOARD_GPIO_POLLED as builtin
Change-Id: Ia3e4ae0df655cfb593b722702434642ac4ca7113
2020-12-18 12:41:19 +09:00
Luke go
1062622938 ODROID-COMMON: arm64/dts: Changed the default gpio-key mapping.
- To avoid conflicts with the default gpio-power key pin and the SPI
  pin, default shortcut pin maps are changed.

Change-Id: If857eafc1e9df101357203ad61ea6ea81b11b571
2020-12-18 12:41:19 +09:00
Luke go
ace71fe4c1 ODROID-C4: arm64/dts: overlay: Add wifi/bt combo.
- To support ap6255, we made wifi/bt combo support board. To use it with
  a ODROID-C4, You need chagne R45 to 10k register. Or please change a
  'gpio_reset' to other pins.

Signed-off-by: Luke go <sangch.go@gmail.com>
Change-Id: I208c11251e3b36bdf27d1505e5bb25a1f4a059c4
2020-12-18 12:41:19 +09:00
Luke Go
01234dd487 ODROID-N2: arm64/dts: overlay: Add a gpio-spdifout.
- Add gpio's spdifout overlays. It support GPIOA 13 -PIN7 spdifout.

Change-Id: I95b99af5e531cba53748c0d82ff112d39ca8bbee
2020-12-18 12:41:02 +09:00
Luke go
202902f042 ODROID-COMMON: arm64/dts: overlay: Add pwm examples.
- N2
  - pwm_c(33) - pwm fan.
  - pwm_d(35) - pwm backlight.

- C4
  - pwm_a(33) - pwm fan.
  - pwm_b(35) - pwm backlight.

Change-Id: If5382b0f5fa515d74d547b1cb20107be5ad813bd
2020-12-18 12:40:06 +09:00
Luke go
65efb21457 ODROID: arm64/dts: overlay: Change CAN chipselect.
Change-Id: I15e2eacd2b6c018b7950dd97ef353d83fb874743
2020-12-18 12:35:31 +09:00
Luke go
2f9cdc7fbe ODROID-COMMON: config: Support CAN BUS.
Change-Id: Ib75ae740bc37c992eed8c479b8da50347b21a900
2020-12-18 12:34:47 +09:00
Dongjin Kim
980354ccbe ODROID-N2: arm64/dts: overlay: add new overlay to run fully loaded fan speed
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I4971f5acccd67a9db30213368870072ba59ee679
2020-12-18 12:34:47 +09:00
Chris KIM
887b51c74b Revert "sd: add sd power cycle for sd3.0 [1/1]"
This reverts commit 1a249d948b.

Change-Id: Ie761d44b73b338fdbceff36c48dee4a809316620
2020-12-18 12:34:47 +09:00
Luke Go
96b8a47a32 ODROID-N2/N2-PLUS: pwm-fan: Changed the trip point.
Change-Id: I2dcee110ff1939216dfdb20e0069f5298b43e9ad
Signed-off-by: Luke Go <sangch.go@gmail.com>
2020-12-18 12:34:47 +09:00
Kevin Kim
e96f70698d ODROID-COMMON: pwm-fan device enabled for active cooling.
Change-Id: I1dcdfa4c22ab72cd24b1be870727420683073f9a
Signed-off-by: Kevin Kim <ckkim@hardkernel.com>
2020-12-18 12:33:27 +09:00
Luke Go
921958bc70 ODROID-N2PLUS: dtbo: Add model name to overlay.
- To name the odroid n2 plus, add name property overlay to the file.

Change-Id: I2c2e5f93989740644165431dfa63fd2f0724fcd4
2020-12-18 12:33:20 +09:00
Luke Go
89b32d7162 ODROID: android: frequency config macro changes.
- Android build each board (N2/C4) at seprated time, So need to common
define to build it.

Change-Id: I558ab468dab3be36717fa248dea41f7718953032
2020-12-18 12:30:40 +09:00
femto
adf17e3a2e ODROID-N2/N2-PLUS: Default freq setting and cpu max_freq limit setting.
board_is_odroidn2 (): Both N2 and N2plus return 'true'

if (is_meson_g12b_cpu() && is_meson_rev_a()) // ODROID-N2
else                                         // ODROID-N2Plus

N2_A53_DEFAULT		1896000	/* N2 Core A53 */
N2_A73_DEFAULT		1800000	/* N2 Core A73 */

N2PLUS_A53_DEFAULT	1908000	/* N2 Plus Core A53 */
N2PLUS_A73_DEFAULT	2208000	/* N2 Plus Core A73 */

Signed-off-by: femto <ckkim@hardkernel.com>
Change-Id: I32fa6b37f54560e9071cf650c74f972b36fc4af2
2020-12-18 12:30:40 +09:00
Chris
45e2c93ea6 ODROID-C4: Fix label redefine in dts 2020-12-18 12:29:27 +09:00
Chris
c46afcb6de ODROID: Fix compile error.
We are rebuilding kernel commits.
2020-12-17 18:10:50 +09:00
Ruixuan Li
366ccec376 emmc: save tuning parameter of hs400 [1/1]
PD#SWPL-15199

Problem:
tunig process of hs400 is too slow

Solution:
saved tuning parameter of hs400 on emmc

Verify:
passed on tm2_t962e2_ab311

Change-Id: Ifd1ba375dd93745c9db33a94f3480ebfc21e999f
Signed-off-by: Ruixuan Li <ruixuan.li@amlogic.com>
Signed-off-by: chunlong.cao <chunlong.cao@amlogic.com>
2020-12-17 17:39:21 +09:00
wenbiao zhang
ec7c326bf0 btsco: config bt sco dts [2/2]
PD#SWPL-30684

Problem:
config bt sco dts

Solution:
config bt sco dts

Verify:
w400

Change-Id: I15943ce6ef2cff1f98bfc668fbcc28b746099978
Signed-off-by: wenbiao zhang <wenbiao.zhang@amlogic.com>
2020-12-17 17:34:01 +09:00
chunlong.cao
5b577fb7d6 lcd: [A311D][BDS][panel]change panel type to lcd_1: mipi TL070WSH27 1024*600.[1/2]
PD#SWPL-32495

Problem:
      change panel type to mipi TL070WSH27 1024*600,cannnot dipslay normally

Solution:
      change display_size_default

 Verify:
      W400

Signed-off-by: chunlong.cao <chunlong.cao@amlogic.com>
Change-Id: Ic3876a2424a8c11dd827f5d5bd1adde8419a6103
2020-12-17 17:34:01 +09:00
chunlong.cao
294bf90eaa touchscreen: [W400][BDS]change to GT911 touch panel [1/1]
PD#SWPL-32704

Problem:
    Unable to touch operation on panel

Solution:
    change to GT911 touch panel

Verify:
    W400

Signed-off-by: chunlong.cao <chunlong.cao@amlogic.com>
Change-Id: Id49d5c93e7576f59926006d5cb993880c2badc8c
2020-12-17 17:34:01 +09:00
Jiacheng Mei
2e63280cb4 dts: change isp cma reserved config fmt [1/1]
PD#SWPL-29311

Problem:
cma reserved fmt not right

Solution:
change config fmt

Verify:
g12b

Change-Id: I2a78c5b61cbc7f08543b1de31aff871a03593580
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
Signed-off-by: chunlong.cao <chunlong.cao@amlogic.com>
2020-12-17 17:34:01 +09:00
Zongdong Jiao
4fb40cb333 hdmitx: remove unnecessary printk during boot [1/1]
PD#SWPL-30632

Problem:
Too many hdmitx printk during boot stage

Solution:
Remove unnecessary printk during boot

Verify:
SM1/Newton

Change-Id: I228bcaab1b307852dcfd7bf0aead8133bd5f13fd
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Signed-off-by: chunlong.cao <chunlong.cao@amlogic.com>
2020-12-17 17:33:54 +09:00
libo
54043bb235 wifi: power on wifi by default. [1/1]
PD#SWPL-28058

Problem:
the PCIe wifi is not recognized,
because wifi is not powered on.

Solution:
power on wifi by default.

Verify:
AC200

Signed-off-by: libo <bo.li@amlogic.com>
Change-Id: I254324756695bdcabfa808d84b69298d392f669d
2020-12-17 17:33:20 +09:00
changqing.gao
4d60a16425 mm: too many memory printk durning boot [1/1]
PD#SWPL-30639

Problem:
too many memory printk durning boot

Solution:
change printk/pr_info to pr_debug

Verify:
ac214

Change-Id: I29a01e2a5b720bf97eb5d02713d24b6b0617d16d
Signed-off-by: changqing.gao <changqing.gao@amlogic.com>
2020-12-17 17:32:54 +09:00
Cao Jian
d43cba0f15 ge2d: remove unnecessary print [1/1]
PD#SWPL-30665

Problem:
too many ge2d printk durning boot

Solution:
remove unnecessary log

Verify:
g12b

Change-Id: If8b7481a575e03cdea8c019858beb22d9b0031ca
Signed-off-by: Cao Jian <jian.cao@amlogic.com>
2020-12-17 17:32:54 +09:00
Cheng Wang
d41d256e47 amvecm: printk optimize [1/1]
PD#SWPL-30668

Problem:
too many vecm printk durning boot.

Solution:
Unnecessary prints by annotated

Verify:
on x301

Change-Id: Ia15dc9c83d62e1055bbf2c4dedf7d0619be17344
Signed-off-by: Cheng Wang <cheng.wang@amlogic.com>
2020-12-17 17:32:54 +09:00
Jiamin Ma
ab1f0787d3 unifykey: remove unnecessary logs [1/1]
PD#SWPL-30662

Problem:
Too many logs during kernel boot up, which slows system down

Solution:
Remove unnecessary logs

Verify:
AC214

only two lines remained
[4.967828] unifykey: no efuse-version set, use default value: -1
[4.968140] unifykey: aml_unifykeys_init done!

Change-Id: I093f93825f8478bb692092c877b32d374cdb7039
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2020-12-17 17:32:54 +09:00
Xindong Xu
765f088f51 dts: enlarge vendor partition [1/2]
PD#SWPL-22866

Problem:
need to larger vendor partition

Solution:
enlarge vendor partition from 320M to 448M

Verify:
dalton

Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
Change-Id: I1e772cd43886b72083918b722cc2ca66b0470bb8
2020-12-17 17:32:54 +09:00
zhiqiang liang
165e1ea9a2 powerdomain: add check ack signal function [1/1]
PD#SWPL-31141

Problem:
powerdomain add ack signal check function

Solution:
modify the code

Verify:
S905D3

Change-Id: I3eb16e613d16bcc867501181968b58ff55243883
Signed-off-by: zhiqiang liang <zhiqiang.liang@amlogic.com>
2020-12-17 17:32:54 +09:00
Dezhi Kong
e8cc1330bd vpp: add nv12 format support [1/1]
PD#SWPL-20468

Problem:
nv12 format is not support in vpp

Solution:
add nv12 format support

Verify:
on U212

Change-Id: I1e621bede63a283931743c2cd3a5ea1548149368
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2020-12-17 17:32:54 +09:00
yanan.wang
c5f75574b8 amstream: fix ff/fb for mpeg4&mpeg12&h265 format is abnormal. [2/2]
PD#SWPL-23122

Problem:
when ff/fb for mpeg4&mpeg12&h265 on trick mode is abnormal.

Solution:
add mpeg4&mpeg12&h265 TRICKMODE_I function.

Verify:
u212

Change-Id: I161d3a57480ed48b29de1fccf52185a28ccf8677
Signed-off-by: yanan.wang <yanan.wang@amlogic.com>
2020-12-17 17:32:53 +09:00
shuanglong.wang
6841226159 videosync: add vmaster mode for cobalt dual video [2/3]
PD#SWPL-20255

Problem:
add vmaster mode for cobalt dual video

Solution:
add vmaster mode for cobalt dual video

Verify:
verify by buildroot

Change-Id: Iacdbee5a83eab6b21c75a79b6665fa12375a6624
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
2020-12-17 17:32:53 +09:00
rongrong zhou
166414a886 v4l2: v4l2 vf video support [1/3]
PD#SWPL-16226

Problem:
v4l2 can not display on vf video

Solution:
add v4l2 vf video support

Verify:
U212

Change-Id: If04fc991edaa57c202f1adcf6b1be6d453bb2af9
Signed-off-by: rongrong zhou <rongrong.zhou@amlogic.com>
2020-12-17 17:32:46 +09:00
apollo.ling
587114712c vdec: add struct for getting multi-vdec information header files part [2/4]
PD#SWPL-1449

Problem:
need to implement a way to get multi-vdec information

Solution:
add new data struct to dynamically record each VDEC's information

Verify:
u212

Change-Id: I5e63d4cf6e7f5e2739b95e2626cc6565d42bdbb0
Signed-off-by: apollo.ling <apollo.ling@amlogic.com>
2020-12-17 17:32:11 +09:00
Nanxin Qin
5cc0a8afd0 v4l: add handles of dev and inst within v4l private data. [1/2]
PD#SWPL-19709

Problem:
Playback youtube 360vr video blurred screen when switch

Solution:
need to check the inst is valid when the res change.

Verify:
u212

Change-Id: I7c58d3b882be47f9681edf074673c4c75f6e3a62
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2020-12-17 17:32:11 +09:00
rongrong zhou
68f65aeaa4 v4l2: drop frames [1/3]
PD#SWPL-17328

Problem:
drop frames

Solution:
1. add trace for debug
2. less than 256K, do not use codec_mm allocation
3. osd fence crash

Verify:
local

Change-Id: Ibc0fe63b73cf20359bda1d743dfc6a14dc82c03f
Signed-off-by: rongrong zhou <rongrong.zhou@amlogic.com>
2020-12-17 17:32:11 +09:00
Nanxin Qin
af0f5ac26f v4l: fixed the build err. [1/1]
PD#SWPL-17646

Problem:
android P patchbuild failed.

Solution:
add the head file v4lvideo_ext.h

Verify:
U212

Change-Id: I17c5cc6f56490335a0d592e4a216e31c6896800a
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
Signed-off-by: chunlong.cao <chunlong.cao@amlogic.com>
2020-12-17 17:32:10 +09:00
zirui.xiao
218b75d698 audio: codec: Optimizing aml_card_init 230ms+ [1/1]
PD#SWPL-29944

Problem:
Optimizing aml_card_init 230ms+

Solution:
Using workqueue to replace the msleep func

Verify:
S905Y2-U221

Signed-off-by: zirui.xiao <zirui.xiao@amlogic.com>
Change-Id: Ib9bef02c1b0e54f13c7c89a2dd25881a9f2c42dd
2020-12-17 17:32:10 +09:00
renjiang.han
6e07d0e713 amlvideo2: The buffer is equipped with canvas every time it is used. [1/1]
PD#SWPL-29593

Problem:
Because each buffer is equipped with canvas, the canvas is not enough.

Solution:
Only use the canvas when the buffer is used,
and allocate the canvas to the next buffer after use.

Verify:
on tm2-ab301

Change-Id: I98a5986f80471c05dfb5638c5404305c03aec867
Signed-off-by: renjiang.han <renjiang.han@amlogic.com>
2020-12-17 17:32:10 +09:00
Jiamin Ma
907d8f7943 cfg: meson: enable CONFIG_HID_A4TECH and CONFIG_HID_MICROSOFT [1/1]
PD#SWPL-19445

Problem:
Can not recognize keyboard and mouse form microsoft and A4TECH

Solution:
Enable CONFIG_HID_A4TECH and CONFIG_HID_MICROSOFT

Verify:
AC214

Change-Id: I0dceaecd86feedf1d6e79bd853ae29e14036f89e
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
Signed-off-by: chunlong.cao <chunlong.cao@amlogic.com>
2020-12-17 17:32:10 +09:00
Jianxiong Pan
11b29ed51b coverity: fix coverity error. [1/1]
PD#SWPL-23799

Problem:
memory leak.
unchecked return value.

Solution:
free the alloced memory.

Verify:
build pass.

Change-Id: I6d55b582c03bf0f5ac3b871925c8e3f477371137
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2020-12-17 17:32:10 +09:00
xiaoxin.cao
58051cb993 camera: ov5640 support color bar mode [1/1]
PD#SWPL-18510

Problem:
OV5640 driver could not support colorbar

Solution:
add S_CTRL

Verify:
AC200 board

Change-Id: I81af61862d780ea5a0ffe95fd1dac019eb4bcba4
Signed-off-by: xiaoxin.cao <xiaoxin.cao@amlogic.com>
2020-12-17 17:32:10 +09:00
dong.wei
c763acf442 camera: fix Out-of-bounds error from Coverity tool [1/1]
PD#SWPL-16538

Problem:
Out-of-bounds error

Solution:
fix Out-of-bounds error

Verify:
verified on w400

Change-Id: I5907acba3f180f5a7cf5417840d2aa5f0f19005b
Signed-off-by: dong.wei <dong.wei@amlogic.com>
2020-12-17 17:32:10 +09:00
Yue Wang
7fc3136540 pcie: fix pcie resume link timeout [1/1]
PD#SWPL-30613

Problem:
fix pcie resume link timeout

Solution:
fix pcie resume link timeout

Verify:
S905D3

Change-Id: I6a4a9870b365c193e7c8cfc963d01cbed86956b3
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2020-12-17 17:32:09 +09:00
Hanjie Lin
b13a985b81 sdcardfs: revert because compile fail [1/1]
PD#SWPL-15901

Problem:
Revert "RAVENPLAT-277: Kernel components sdcardfs - CVE-2018-9514 [1/1]"

Solution:
This reverts commit d03e7aa0704f2165d357337d77041041ac14af27.

Platform:
Raven

Verify:
Raven

Change-Id: I6110ce2290dc763146d1de68d86ab227a3cb8890
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2020-12-17 17:32:09 +09:00
Alan Stern
0c7ec20f1a USB: core: Fix free-while-in-use bug in the USB S-Glibrary (CVE-2020-12464)
PD#SWPL-29560

commit 056ad39ee9 upstream.

FuzzUSB (a variant of syzkaller) found a free-while-still-in-use bug
in the USB scatter-gather library:

BUG: KASAN: use-after-free in atomic_read
include/asm-generic/atomic-instrumented.h:26 [inline]
BUG: KASAN: use-after-free in usb_hcd_unlink_urb+0x5f/0x170
drivers/usb/core/hcd.c:1607
Read of size 4 at addr ffff888065379610 by task kworker/u4:1/27

CPU: 1 PID: 27 Comm: kworker/u4:1 Not tainted 5.5.11 #2
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS
1.10.2-1ubuntu1 04/01/2014
Workqueue: scsi_tmf_2 scmd_eh_abort_handler
Call Trace:
 __dump_stack lib/dump_stack.c:77 [inline]
 dump_stack+0xce/0x128 lib/dump_stack.c:118
 print_address_description.constprop.4+0x21/0x3c0 mm/kasan/report.c:374
 __kasan_report+0x153/0x1cb mm/kasan/report.c:506
 kasan_report+0x12/0x20 mm/kasan/common.c:639
 check_memory_region_inline mm/kasan/generic.c:185 [inline]
 check_memory_region+0x152/0x1b0 mm/kasan/generic.c:192
 __kasan_check_read+0x11/0x20 mm/kasan/common.c:95
 atomic_read include/asm-generic/atomic-instrumented.h:26 [inline]
 usb_hcd_unlink_urb+0x5f/0x170 drivers/usb/core/hcd.c:1607
 usb_unlink_urb+0x72/0xb0 drivers/usb/core/urb.c:657
 usb_sg_cancel+0x14e/0x290 drivers/usb/core/message.c:602
 usb_stor_stop_transport+0x5e/0xa0 drivers/usb/storage/transport.c:937

This bug occurs when cancellation of the S-G transfer races with
transfer completion.  When that happens, usb_sg_cancel() may continue
to access the transfer's URBs after usb_sg_wait() has freed them.

The bug is caused by the fact that usb_sg_cancel() does not take any
sort of reference to the transfer, and so there is nothing to prevent
the URBs from being deallocated while the routine is trying to use
them.  The fix is to take such a reference by incrementing the
transfer's io->count field while the cancellation is in progres and
decrementing it afterward.  The transfer's URBs are not deallocated
until io->complete is triggered, which happens when io->count reaches
zero.

Change-Id: I2caeb600a37113f0f6a6374a4481d15f13c8b55e
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reported-and-tested-by: Kyungtae Kim <kt0755@gmail.com>
CC: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/Pine.LNX.4.44L0.2003281615140.14837-100000@netrider.rowland.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2020-12-17 17:32:09 +09:00
Paul Moore
cbc5bcf810 selinux: properly handle multiple messages in selinux_netlink_send() (CVE-2020-0255)
PD#SWPL-29581

commit fb73974172 upstream.

Fix the SELinux netlink_send hook to properly handle multiple netlink
messages in a single sk_buff; each message is parsed and subject to
SELinux access control.  Prior to this patch, SELinux only inspected
the first message in the sk_buff.

Change-Id: Id73f242290f8693b1ab1177c27cae8add5a5cbe6
Cc: stable@vger.kernel.org
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Reviewed-by: Stephen Smalley <stephen.smalley.work@gmail.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2020-12-17 17:32:09 +09:00
Jiri Slaby
725a012abd vt: selection, close sel_buffer race (CVE-2020-8648)
PD#SWPL-29182

commit 07e6124a1a upstream.

syzkaller reported this UAF:
BUG: KASAN: use-after-free in n_tty_receive_buf_common+0x2481/0x2940 drivers/tty/n_tty.c:1741
Read of size 1 at addr ffff8880089e40e9 by task syz-executor.1/13184

CPU: 0 PID: 13184 Comm: syz-executor.1 Not tainted 5.4.7 #1
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014
Call Trace:
...
 kasan_report+0xe/0x20 mm/kasan/common.c:634
 n_tty_receive_buf_common+0x2481/0x2940 drivers/tty/n_tty.c:1741
 tty_ldisc_receive_buf+0xac/0x190 drivers/tty/tty_buffer.c:461
 paste_selection+0x297/0x400 drivers/tty/vt/selection.c:372
 tioclinux+0x20d/0x4e0 drivers/tty/vt/vt.c:3044
 vt_ioctl+0x1bcf/0x28d0 drivers/tty/vt/vt_ioctl.c:364
 tty_ioctl+0x525/0x15a0 drivers/tty/tty_io.c:2657
 vfs_ioctl fs/ioctl.c:47 [inline]

It is due to a race between parallel paste_selection (TIOCL_PASTESEL)
and set_selection_user (TIOCL_SETSEL) invocations. One uses sel_buffer,
while the other frees it and reallocates a new one for another
selection. Add a mutex to close this race.

The mutex takes care properly of sel_buffer and sel_buffer_lth only. The
other selection global variables (like sel_start, sel_end, and sel_cons)
are protected only in set_selection_user. The other functions need quite
some more work to close the races of the variables there. This is going
to happen later.

This likely fixes (I am unsure as there is no reproducer provided) bug
206361 too. It was marked as CVE-2020-8648.

Change-Id: I0ebcb48ecb58db7d12b0d2068deddea73deea1cd
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Reported-by: syzbot+59997e8d5cbdc486e6f6@syzkaller.appspotmail.com
References: https://bugzilla.kernel.org/show_bug.cgi?id=206361
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200210081131.23572-2-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2020-12-17 17:32:09 +09:00
Dmitry Torokhov
9f1db5e0fe Input: add safety guards to input_set_keycode() (CVE-2019-20636)
PD#SWPL-29181

commit cb222aed03 upstream

If we happen to have a garbage in input device's keycode table with values
too big we'll end up doing clear_bit() with offset way outside of our
bitmaps, damaging other objects within an input device or even outside of
it. Let's add sanity checks to the returned old keycodes.

Change-Id: I9c376dc61b1e81f3c538f472c1031a74d3c81331
Reported-by: syzbot+c769968809f9359b07aa@syzkaller.appspotmail.com
Reported-by: syzbot+76f3a30e88d256644c78@syzkaller.appspotmail.com
Link: https://lore.kernel.org/r/20191207212757.GA245964@dtor-ws
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2020-12-17 17:32:09 +09:00