shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity
658,065 Commits 55 Branches 2,486 Tags
4.9.218-21
Commit Graph

44610 Commits

Author SHA1 Message Date
Mauro (mdrjr) Ribeiro
965041309b Merge tag 'v4.9.218' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.218 stable release
 2020-04-07 21:33:19 -03:00
Mauro (mdrjr) Ribeiro
2e7d8f2c65 Merge tag 'v4.9.215' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.215 stable release
 2020-04-07 21:32:59 -03:00
Mauro (mdrjr) Ribeiro
0a50ebfc55 Merge tag 'v4.9.213' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.213 stable release
 2020-04-07 21:28:12 -03:00
Mauro (mdrjr) Ribeiro
e6b94853ef Merge tag 'v4.9.212' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.212 stable release
 2020-04-07 21:26:32 -03:00
Mauro (mdrjr) Ribeiro
6bea55ddf0 Merge tag 'v4.9.210' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.210 stable release
 2020-04-07 21:21:26 -03:00
Mauro (mdrjr) Ribeiro
61efa5745a Merge tag 'v4.9.208' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.208 stable release
 2020-04-07 21:21:16 -03:00
Mauro (mdrjr) Ribeiro
ef076b4c70 Merge tag 'v4.9.207' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.207 stable release
 2020-04-07 21:21:08 -03:00
Mauro (mdrjr) Ribeiro
b3fa299787 Merge tag 'v4.9.206' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.206 stable release
 2020-04-07 21:18:21 -03:00
Mauro (mdrjr) Ribeiro
2d3a85c598 Merge tag 'v4.9.204' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.204 stable release
 2020-04-07 21:18:07 -03:00
Mauro (mdrjr) Ribeiro
f0735e9eb5 Merge tag 'v4.9.199' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.199 stable release
 2020-04-07 21:00:55 -03:00
Mauro (mdrjr) Ribeiro
14a84a2ad4 Merge tag 'v4.9.198' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.198 stable release
 2020-04-07 21:00:51 -03:00
Mauro (mdrjr) Ribeiro
dae544b697 Merge tag 'v4.9.197' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.197 stable release
 2020-04-07 21:00:44 -03:00
Mauro (mdrjr) Ribeiro
09019bb1f7 Merge tag 'v4.9.190' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.190 stable release
 2020-04-07 20:17:16 -03:00
Mauro (mdrjr) Ribeiro
33417c4f2f Merge tag 'v4.9.187' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.187 stable release
 2020-04-07 20:10:04 -03:00
Mauro (mdrjr) Ribeiro
376539f57b Merge tag 'v4.9.186' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.186 stable release
 2020-04-07 20:09:36 -03:00
Mauro (mdrjr) Ribeiro
52de765630 Merge tag 'v4.9.183' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.183 stable release
 2020-04-07 20:05:53 -03:00
Mauro (mdrjr) Ribeiro
a826960dce Merge tag 'v4.9.181' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.181 stable release
 2020-04-07 20:05:31 -03:00
Mauro (mdrjr) Ribeiro
d1b261b0e1 Merge tag 'v4.9.175' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.175 stable release
 2020-04-07 15:09:06 -03:00
Mauro (mdrjr) Ribeiro
8889459f00 Merge tag 'v4.9.174' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.174 stable release
 2020-04-07 15:08:55 -03:00
Mauro (mdrjr) Ribeiro
946fb5d219 Merge tag 'v4.9.173' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.173 stable release
 2020-04-07 15:05:30 -03:00
Mauro (mdrjr) Ribeiro
634859121a Merge tag 'v4.9.171' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.171 stable release
 2020-04-07 15:05:21 -03:00
Mauro (mdrjr) Ribeiro
effa03aa83 Merge tag 'v4.9.167' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.167 stable release
 2020-04-07 14:57:01 -03:00
Mauro (mdrjr) Ribeiro
e62b889e63 Merge tag 'v4.9.163' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.163 stable release
 2020-04-07 14:56:15 -03:00
Mauro (mdrjr) Ribeiro
1c35b80986 Merge tag 'v4.9.156' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.156 stable release
 2020-04-07 14:46:51 -03:00
Mauro (mdrjr) Ribeiro
58f977f9a4 Merge tag 'v4.9.154' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.154 stable release
 2020-04-07 14:46:42 -03:00
Mauro (mdrjr) Ribeiro
a000fbd3c8 Merge tag 'v4.9.149' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.149 stable release
 2020-04-07 14:42:55 -03:00
Mauro (mdrjr) Ribeiro
05afab09b5 Merge tag 'v4.9.146' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.146 stable release
 2020-04-07 14:40:29 -03:00
Mauro (mdrjr) Ribeiro
877a56c96e Merge tag 'v4.9.145' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.145 stable release
 2020-04-07 14:40:23 -03:00
Mauro (mdrjr) Ribeiro
60bf0e0c88 Merge tag 'v4.9.144' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.144 stable release
 2020-04-07 14:38:25 -03:00
Mauro (mdrjr) Ribeiro
846bf292bf Merge tag 'v4.9.136' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.136 stable release
 2020-04-07 13:40:17 -03:00
Mauro (mdrjr) Ribeiro
e70755fb49 Merge tag 'v4.9.131' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.131 stable release
 2020-04-07 13:29:46 -03:00
Mauro (mdrjr) Ribeiro
649073e44f Merge tag 'v4.9.128' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.128 stable release
 2020-04-07 13:26:06 -03:00
Mauro (mdrjr) Ribeiro
a4e561af29 Merge tag 'v4.9.127' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.127 stable release
 2020-04-07 13:21:25 -03:00
Mauro (mdrjr) Ribeiro
bcd0914f11 Merge tag 'v4.9.125' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.125 stable release
 2020-04-07 13:20:06 -03:00
Mauro (mdrjr) Ribeiro
8cc5b2adad Merge tag 'v4.9.117' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.117 stable release
 2020-04-06 22:43:27 -03:00
Deokgyu Yang
677244d300 ODROID-COMMON: staging/fbtft: Add fb_hktft32 module for Hardkernel 3.2 inch TFT LCD 
This is for Odroid-N2/C4. Slightly different from the one for Odroid-XU4.

Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: I615bd5494191c69c75fe6c98d399ebad27fac80b
 2020-04-03 11:14:34 +09:00
Qiujun Huang
482aa95582 staging: wlan-ng: fix use-after-free Read in hfa384x_usbin_callback 
commit 1165dd73e8 upstream.

We can't handle the case length > WLAN_DATA_MAXLEN.
Because the size of rxfrm->data is WLAN_DATA_MAXLEN(2312), and we can't
read more than that.

Thanks-to: Hillf Danton <hdanton@sina.com>
Reported-and-tested-by: syzbot+7d42d68643a35f71ac8a@syzkaller.appspotmail.com
Signed-off-by: Qiujun Huang <hqjagain@gmail.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200326131850.17711-1-hqjagain@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2020-04-02 17:20:37 +02:00
Qiujun Huang
eae4e4b970 staging: wlan-ng: fix ODEBUG bug in prism2sta_disconnect_usb 
commit a1f165a6b7 upstream.

We should cancel hw->usb_work before kfree(hw).

Reported-by: syzbot+6d2e7f6fa90e27be9d62@syzkaller.appspotmail.com
Signed-off-by: Qiujun Huang <hqjagain@gmail.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/1585120006-30042-1-git-send-email-hqjagain@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2020-04-02 17:20:37 +02:00
Larry Finger
8b9ab9fd62 staging: rtl8188eu: Add ASUS USB-N10 Nano B1 to device table 
commit 38ef48f7d4 upstream.

The ASUS USB-N10 Nano B1 has been reported as a new RTL8188EU device.
Add it to the device tables.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Reported-by: kovi <zraetn@gmail.com>
Cc: Stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200321180011.26153-1-Larry.Finger@lwfinger.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2020-04-02 17:20:37 +02:00
Johan Hovold
0e68b6894f staging: greybus: loopback_test: fix potential path truncations 
commit ae62cf5eb2 upstream.

Newer GCC warns about possible truncations of two generated path names as
we're concatenating the configurable sysfs and debugfs path prefixes
with a filename and placing the results in buffers of the same size as
the maximum length of the prefixes.

	snprintf(d->name, MAX_STR_LEN, "gb_loopback%u", dev_id);

	snprintf(d->sysfs_entry, MAX_SYSFS_PATH, "%s%s/",
		 t->sysfs_prefix, d->name);

	snprintf(d->debugfs_entry, MAX_SYSFS_PATH, "%sraw_latency_%s",
		 t->debugfs_prefix, d->name);

Fix this by separating the maximum path length from the maximum prefix
length and reducing the latter enough to fit the generated strings.

Note that we also need to reduce the device-name buffer size as GCC
isn't smart enough to figure out that we ever only used MAX_STR_LEN
bytes of it.

Fixes: 6b0658f687 ("greybus: tools: Add tools directory to greybus repo and add loopback")
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20200312110151.22028-4-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2020-04-02 17:20:28 +02:00
Johan Hovold
d444ed69b4 staging: greybus: loopback_test: fix potential path truncation 
commit f160238348 upstream.

Newer GCC warns about a possible truncation of a generated sysfs path
name as we're concatenating a directory path with a file name and
placing the result in a buffer that is half the size of the maximum
length of the directory path (which is user controlled).

loopback_test.c: In function 'open_poll_files':
loopback_test.c:651:31: warning: '%s' directive output may be truncated writing up to 511 bytes into a region of size 255 [-Wformat-truncation=]
  651 |   snprintf(buf, sizeof(buf), "%s%s", dev->sysfs_entry, "iteration_count");
      |                               ^~
loopback_test.c:651:3: note: 'snprintf' output between 16 and 527 bytes into a destination of size 255
  651 |   snprintf(buf, sizeof(buf), "%s%s", dev->sysfs_entry, "iteration_count");
      |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Fix this by making sure the buffer is large enough the concatenated
strings.

Fixes: 6b0658f687 ("greybus: tools: Add tools directory to greybus repo and add loopback")
Fixes: 9250c0ee26 ("greybus: Loopback_test: use poll instead of inotify")
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20200312110151.22028-3-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2020-04-02 17:20:28 +02:00
Samuel Thibault
05f7f08e03 staging/speakup: fix get_word non-space look-ahead 
commit 9d32c0cde4 upstream.

get_char was erroneously given the address of the pointer to the text
instead of the address of the text, thus leading to random crashes when
the user requests speaking a word while the current position is on a space
character and say_word_ctl is not enabled.

Reported-on: https://github.com/bytefire/speakup/issues/1
Reported-by: Kirk Reiser <kirk@reisers.ca>
Reported-by: Janina Sajka <janina@rednote.net>
Reported-by: Alexandr Epaneshnikov <aarnaarn2@gmail.com>
Reported-by: Gregory Nowak <greg@gregn.net>
Reported-by: deedra waters <deedra@the-brannons.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Tested-by: Alexandr Epaneshnikov <aarnaarn2@gmail.com>
Tested-by: Gregory Nowak <greg@gregn.net>
Tested-by: Michael Taboada <michael@michaels.world>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200306003047.thijtmqrnayd3dmw@function
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2020-04-02 17:20:25 +02:00
Michael Straube
7be6822e7f staging: rtl8188eu: Add device id for MERCUSYS MW150US v2 
commit bb5786b928 upstream.

This device was added to the stand-alone driver on github.
Add it to the staging driver as well.

Link: https://github.com/lwfinger/rtl8188eu/commit/2141f244c3e7
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200312093652.13918-1-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2020-04-02 17:20:25 +02:00
Deokgyu Yang
f0b1b6af08 ODROID-COMMON: staging/fbtft: Add fb_hktft35 module for Hardkernel 3.5 inch TFT LCD 
This is for Odroid-N2/C4. Slightly different from the one for Odroid-XU4.

Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: I7456b91615e8e9dc377e88ebb1e524620ca18f26
 2020-04-02 10:20:20 +09:00
Laura Abbott
0c6c2d82f6 staging: android: ion: Call dma_map_sg for syncing and mapping [2/2] 
PD#SWPL-9254

Problem:
uncached display unexpectly.

Solution:
Technically, calling dma_buf_map_attachment should return a buffer
properly dma_mapped. Add calls to dma_map_sg to begin_cpu_access to
ensure this happens. As a side effect, this lets Ion buffers take
advantage of the dma_buf sync ioctls.

Verify:
galilei, franklin

Change-Id: Ib6ca06e59e81031d3c65c2df8824b46baaba6c9f
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
 2020-03-25 11:45:47 +09:00
Laura Abbott
ff3382a5df ODROID-COMMON: staging: android: ion: Duplicate sg_table [1/2] 
PD#SWPL-9254

Problem:
Ion currently returns a single sg_table on each dma_map call. This is
incorrect for later usage.

Solution:
dup sg table on each dma_map call

Verify:
galilei, franklin

Change-Id: I6df2baa33bba9303b2ac25210ebaf56a337d56a2
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
 2020-03-25 11:40:39 +09:00
Kevin Kim
a56160e152 ODROID-N2:Added force64b parameter to fbtft&spicc to increase the refresh-rate. 
Ex)
modprobe spi_meson_spicc force64b=1
modprobe fbtft_device name=odroid35 rotate=90 force64b=1

Change-Id: I9545740a633f2289648e5bcf72e55fbc23aecebf
 2020-03-13 18:08:44 +09:00
charles.park
cc13c90649 ODROID-N2: fbtft_device new fast spi lcd(ili9486) driver added. 
Change-Id: Iaa24ea37679637729b0ca7b773b9c89e6a0167f5
 2020-03-13 18:08:44 +09:00
charles.park
98e5a336a5 ODROID-N2: fbtft odroid35 driver added(fast spi lcd) 
Change-Id: Ic6a40551bf758d8e1f77b9dfe4031dc9d2f1f078
 2020-03-13 18:08:44 +09:00
Joy Cho
2f4ff029b5 ODROID-N2: staging: lirc: support GPIO based IR Blaster 
Change-Id: I0a4993e68784a31f3d89c2f54e69dc70aa7bc5f3
 2020-03-13 18:08:44 +09:00