4.4.195-stable review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 1/99 Revert "Bluetooth: validate BLE connection interval updates"
In reply to Greg Kroah-HartmanFrom: Marcel Holtmann <[email protected]>
[ Upstream commit 68d19d7d995759b96169da5aac313363f92a9075 ]
This reverts commit c49a8682fc5d298d44e8d911f4fa14690ea9485e.
There are devices which require low connection intervals for usable operation including keyboards and mice. Forcing a static connection interval for these types of devices has an impact in latency and causes a regression.
--- net/bluetooth/hci_event.c | 5 ----- net/bluetooth/l2cap_core.c | 9 +-------- 2 files changed, 1 insertion(+), 13 deletions(-)
net/bluetooth/hci_event.c +0 -5
@@ -5062,11 +5062,6 @@ static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev,return send_conn_param_neg_reply (hdev, handle,HCI_ERROR_UNKNOWN_CONN_ID ); -if (min < hcon->le_conn_min_interval || - max > hcon->le_conn_max_interval) -return send_conn_param_neg_reply (hdev, handle, -HCI_ERROR_INVALID_LL_PARAMS ); -if (hci_check_conn_params (min, max, latency, timeout))return send_conn_param_neg_reply (hdev, handle,HCI_ERROR_INVALID_LL_PARAMS );
net/bluetooth/l2cap_core.c +1 -8
@@ -5266,14 +5266,7 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn,memset (&rsp,0 ,sizeof (rsp)); -if (min < hcon->le_conn_min_interval || - max > hcon->le_conn_max_interval) { -BT_DBG ("requested connection interval exceeds current bounds." ); - err = -EINVAL ; - }else { - err =hci_check_conn_params (min, max, latency, to_multiplier); - } - + err =hci_check_conn_params (min, max, latency, to_multiplier);if (err) rsp.result =cpu_to_le16 (L2CAP_CONN_PARAM_REJECTED );else
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/99 ALSA: hda - Add laptop imic fixup for ASUS M9V laptop
In reply to Greg Kroah-HartmanFrom: Shih-Yuan Lee (FourDollars) <[email protected]>
commit 7b485d175631be676424aedb8cd2f66d0c93da78 upstream.
The same fixup to enable laptop imic is needed for ASUS M9V with AD1986A codec like another HP machine.
--- sound/pci/hda/patch_analog.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_analog.c +1 -0
@@ -370,6 +370,7 @@ static const struct hda_fixup ad1986a_fistatic const struct snd_pci_quirk ad1986a_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x30af ,"HP B2800" ,AD1986A_FIXUP_LAPTOP_IMIC ), +SND_PCI_QUIRK (0x1043 ,0x1153 ,"ASUS M9V" ,AD1986A_FIXUP_LAPTOP_IMIC ),SND_PCI_QUIRK (0x1043 ,0x1443 ,"ASUS Z99He" ,AD1986A_FIXUP_EAPD ),SND_PCI_QUIRK (0x1043 ,0x1447 ,"ASUS A8JN" ,AD1986A_FIXUP_EAPD ),SND_PCI_QUIRK_MASK (0x1043 ,0xff00 ,0x8100 ,"ASUS P5" ,AD1986A_FIXUP_3STACK ),
Greg Kroah-Hartman
maintainerPATCH 11/99 mac80211: Print text for disassociation reason
In reply to Greg Kroah-HartmanFrom: Arkadiusz Miskiewicz <[email protected]>
[ Upstream commit 68506e9af132a6b5735c1dd4b11240da0cf5eeae ]
When disassociation happens only numeric reason is printed in ieee80211_rx_mgmt_disassoc(). Add text variant, too.
--- net/mac80211/mlme.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/mac80211/mlme.c +3 -2
@@ -2857,8 +2857,9 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata, reason_code =le16_to_cpu (mgmt->u.disassoc.reason_code); -sdata_info (sdata,"disassociated from %pM (Reason: %u)\n" , - mgmt->sa, reason_code); +sdata_info (sdata,"disassociated from %pM (Reason: %u=%s)\n" , + mgmt->sa, reason_code, +ieee80211_get_reason_code_string (reason_code));ieee80211_set_disassoc (sdata,0 ,0 , false,NULL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/99 mac80211: handle deauthentication/disassociation from TDLS peer
In reply to Greg Kroah-HartmanFrom: Yu Wang <[email protected]>
[ Upstream commit 79c92ca42b5a3e0ea172ea2ce8df8e125af237da ]
When receiving a deauthentication/disassociation frame from a TDLS peer, a station should not disconnect the current AP, but only disable the current TDLS link if it's enabled.
Without this change, a TDLS issue can be reproduced by following the steps as below:
1. STA-1 and STA-2 are connected to AP, bidirection traffic is running between STA-1 and STA-2.
2. Set up TDLS link between STA-1 and STA-2, stay for a while, then teardown TDLS link.
3. Repeat step #2 and monitor the connection between STA and AP.
During the test, one STA may send a deauthentication/disassociation frame to another, after TDLS teardown, with reason code 6/7, which
means: Class 2/3 frame received from nonassociated STA.
On receive this frame, the receiver STA will disconnect the current AP and then reconnect. It's not a expected behavior, purpose of this frame should be disabling the TDLS link, not the link with AP.
--- net/mac80211/ieee80211_i.h | 3 +++ net/mac80211/mlme.c | 12 +++++++++++- net/mac80211/tdls.c | 23 +++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-)
net/mac80211/ieee80211_i.h +3 -0
@@ -2059,6 +2059,9 @@ void ieee80211_tdls_cancel_channel_switch(struct wiphy *wiphy, const u8 *addr);void ieee80211_teardown_tdls_peers (struct ieee80211_sub_if_data *sdata);void ieee80211_tdls_chsw_work (struct work_struct *wk); +void ieee80211_tdls_handle_disconnect (struct ieee80211_sub_if_data *sdata, +const u8 *peer,u16 reason); +const char *ieee80211_get_reason_code_string (u16 reason_code);extern const struct ethtool_ops ieee80211_ethtool_ops;
net/mac80211/mlme.c +11 -1
@@ -2743,7 +2743,7 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,#define case_WLAN (type) \ case WLAN_REASON_##type: return #type -static const char *ieee80211_get_reason_code_string (u16 reason_code) +const char *ieee80211_get_reason_code_string (u16 reason_code) {switch (reason_code) {case_WLAN (UNSPECIFIED );
@@ -2808,6 +2808,11 @@ static void ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,if (len <24 +2 )return ; +if (!ether_addr_equal (mgmt->bssid, mgmt->sa)) { +ieee80211_tdls_handle_disconnect (sdata, mgmt->sa, reason_code); +return ; + } +if (ifmgd->associated &ðer_addr_equal (mgmt->bssid, ifmgd->associated->bssid)) {const u8 *bssid = ifmgd->associated->bssid;
@@ -2857,6 +2862,11 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata, reason_code =le16_to_cpu (mgmt->u.disassoc.reason_code); +if (!ether_addr_equal (mgmt->bssid, mgmt->sa)) { +ieee80211_tdls_handle_disconnect (sdata, mgmt->sa, reason_code); +return ; + } +sdata_info (sdata,"disassociated from %pM (Reason: %u=%s)\n" , mgmt->sa, reason_code,ieee80211_get_reason_code_string (reason_code));
net/mac80211/tdls.c +23 -0
@@ -1963,3 +1963,26 @@ void ieee80211_tdls_chsw_work(struct work_struct *wk) }rtnl_unlock (); } + +void ieee80211_tdls_handle_disconnect (struct ieee80211_sub_if_data *sdata, +const u8 *peer,u16 reason) +{ +struct ieee80211_sta *sta; + +rcu_read_lock (); + sta =ieee80211_find_sta (&sdata->vif, peer); +if (!sta || !sta->tdls) { +rcu_read_unlock (); +return ; + } +rcu_read_unlock (); + +tdls_dbg (sdata,"disconnected from TDLS peer %pM (Reason: %u=%s)\n" , + peer, reason, +ieee80211_get_reason_code_string (reason)); + +ieee80211_tdls_oper_request (&sdata->vif, peer, +NL80211_TDLS_TEARDOWN , +WLAN_REASON_TDLS_TEARDOWN_UNREACHABLE , +GFP_ATOMIC ); +}
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/99 locking/lockdep: Add debug_locks check in __lock_downgrade()
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
[ Upstream commit 513e1073d52e55b8024b4f238a48de7587c64ccf ]
Tetsuo Handa had reported he saw an incorrect "downgrading a read lock" warning right after a previous lockdep warning. It is likely that the previous warning turned off lock debugging causing the lockdep to have inconsistency states leading to the lock downgrade warning.
Fix that by add a check for debug_locks at the beginning of __lock_downgrade().
--- kernel/locking/lockdep.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/locking/lockdep.c +3 -0
@@ -3314,6 +3314,9 @@ __lock_set_class(struct lockdep_map *lock, const char *name,unsigned int depth;int i; +if (unlikely (!debug_locks)) +return 0 ; + depth = curr->lockdep_depth;/* * This function is about (re)setting the class of a held lock,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/99 irqchip/gic-v3-its: Fix LPI release for Multi-MSI devices
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit c9c96e30ecaa0aafa225aa1a5392cb7db17c7a82 ]
When allocating a range of LPIs for a Multi-MSI capable device, this allocation extended to the closest power of 2.
But on the release path, the interrupts are released one by one. This results in not releasing the "extra" range, leaking the its_device. Trying to reprobe the device will then fail.
Fix it by releasing the LPIs the same way we allocate them.
--- drivers/irqchip/irq-gic-v3-its.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +4 -5
@@ -1372,14 +1372,13 @@ static void its_irq_domain_free(struct irq_domain *domain, unsigned int virq,struct its_device *its_dev =irq_data_get_irq_chip_data (d);int i; +bitmap_release_region (its_dev->event_map.lpi_map, +its_get_event_id (irq_domain_get_irq_data (domain, virq)), +get_count_order (nr_irqs)); +for (i =0 ; i < nr_irqs; i++) {struct irq_data *data =irq_domain_get_irq_data (domain, virq + i); -u32 event =its_get_event_id (data); - -/* Mark interrupt index as unused */ -clear_bit (event, its_dev->event_map.lpi_map); -/* Nuke the entry in the domain */ irq_domain_reset_irq_data (data); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/99 f2fs: check all the data segments against all node ones
In reply to Greg Kroah-HartmanFrom: Surbhi Palande <[email protected]>
[ Upstream commit 1166c1f2f69117ad254189ca781287afa6e550b6 ]
As a part of the sanity checking while mounting, distinct segment number assignment to data and node segments is verified. Fixing a small bug in this verification between node and data segments. We need to check all the data segments with all the node segments.
--- fs/f2fs/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/f2fs/super.c +2 -2
@@ -1211,11 +1211,11 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) } }for (i =0 ; i <NR_CURSEG_NODE_TYPE ; i++) { -for (j = i; j <NR_CURSEG_DATA_TYPE ; j++) { +for (j =0 ; j <NR_CURSEG_DATA_TYPE ; j++) {if (le32_to_cpu (ckpt->cur_node_segno[i]) ==le32_to_cpu (ckpt->cur_data_segno[j])) {f2fs_msg (sbi->sb,KERN_ERR , -"Data segment (%u) and Data segment (%u)" +"Node segment (%u) and Data segment (%u)" " has the same segno: %u" , i, j,le32_to_cpu (ckpt->cur_node_segno[i]));return 1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/99 f2fs: fix to do sanity check on segment bitmap of LFS curseg
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit c854f4d681365498f53ba07843a16423625aa7e9 ]
As Jungyeon Reported in bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=203233
- Reproduces
gcc poc_13.c
./run.sh f2fs
- Kernel messages
F2FS-fs (sdb): Bitmap was wrongly set, blk:4608
kernel BUG at fs/f2fs/segment.c:2133!
RIP: 0010:update_sit_entry+0x35d/0x3e0 Call Trace: f2fs_allocate_data_block+0x16c/0x5a0 do_write_page+0x57/0x100 f2fs_do_write_node_page+0x33/0xa0 __write_node_page+0x270/0x4e0 f2fs_sync_node_pages+0x5df/0x670 f2fs_write_checkpoint+0x364/0x13a0 f2fs_sync_fs+0xa3/0x130 f2fs_do_sync_file+0x1a6/0x810 do_fsync+0x33/0x60 __x64_sys_fsync+0xb/0x10 do_syscall_64+0x43/0x110 entry_SYSCALL_64_after_hwframe+0x44/0xa9
The testcase fails because that, in fuzzed image, current segment was allocated with LFS type, its .next_blkoff should point to an unused block address, but actually, its bitmap shows it's not. So during allocation, f2fs crash when setting bitmap.
Introducing sanity_check_curseg() to check such inconsistence of current in-used segment.
--- fs/f2fs/segment.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
fs/f2fs/segment.c +39 -0
@@ -2262,6 +2262,41 @@ static int build_dirty_segmap(struct f2fs_sb_info *sbi)return init_victim_secmap (sbi); } +static int sanity_check_curseg (struct f2fs_sb_info *sbi) +{ +int i; + +/* +* In LFS/SSR curseg, .next_blkoff should point to an unused blkaddr; +* In LFS curseg, all blkaddr after .next_blkoff should be unused. +*/ +for (i =0 ; i <NO_CHECK_TYPE ; i++) { +struct curseg_info *curseg =CURSEG_I (sbi, i); +struct seg_entry *se =get_seg_entry (sbi, curseg->segno); +unsigned int blkofs = curseg->next_blkoff; + +if (f2fs_test_bit (blkofs, se->cur_valid_map)) + goto out; + +if (curseg->alloc_type ==SSR ) +continue ; + +for (blkofs +=1 ; blkofs < sbi->blocks_per_seg; blkofs++) { +if (!f2fs_test_bit (blkofs, se->cur_valid_map)) +continue ; +out: +f2fs_msg (sbi->sb,KERN_ERR , +"Current segment's next free block offset is " +"inconsistent with bitmap, logtype:%u, " +"segno:%u, type:%u, next_blkoff:%u, blkofs:%u" , + i, curseg->segno, curseg->alloc_type, + curseg->next_blkoff, blkofs); +return -EINVAL ; + } + } +return 0 ; +} +/* * Update min, max modified time for cost-benefit GC algorithm */
@@ -2350,6 +2385,10 @@ int build_segment_manager(struct f2fs_sb_info *sbi)if (err)return err; + err =sanity_check_curseg (sbi); +if (err) +return err; +init_min_max_mtime (sbi);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/99 Bluetooth: btrtl: Additional Realtek 8822CE Bluetooth devices
In reply to Greg Kroah-HartmanFrom: Jian-Hong Pan <[email protected]>
[ Upstream commit 6d0762b19c5963ff9e178e8af3626532ee04d93d ]
The ASUS X412FA laptop contains a Realtek RTL8822CE device with an associated BT chip using a USB ID of 04ca:4005. This ID is added to the driver.
The /sys/kernel/debug/usb/devices portion for this device is:
T: Bus=01 Lev=01 Prnt=01 Port=09 Cnt=04 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 1.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=04ca ProdID=4005 Rev= 0.00 S: Manufacturer=Realtek S: Product=Bluetooth Radio S: SerialNumber=00e04c000001 C:* #Ifs= 2 Cfg#= 1 Atr=a0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms
--- drivers/bluetooth/btusb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bluetooth/btusb.c +3 -0
@@ -353,6 +353,9 @@ static const struct usb_device_id blacklist_table[] = {/* Additional Realtek 8822BE Bluetooth devices */ { USB_DEVICE(0x0b05, 0x185c), .driver_info = BTUSB_REALTEK }, + /* Additional Realtek 8822CE Bluetooth devices */ + { USB_DEVICE(0x04ca, 0x4005), .driver_info = BTUSB_REALTEK }, + /* Silicon Wave based devices */ { USB_DEVICE(0x0c10, 0x0000), .driver_info = BTUSB_SWAVE },
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/99 arcnet: provide a buffer big enough to actually receive packets
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 108639aac35eb57f1d0e8333f5fc8c7ff68df938 ]
struct archdr is only big enough to hold the header of various types of arcnet packets. So to provide enough space to hold the data read from hardware provide a buffer large enough to hold a packet with maximal size.
The problem was noticed by the stack protector which makes the kernel oops.
--- drivers/net/arcnet/arcnet.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/net/arcnet/arcnet.c +17 -14
@@ -1009,31 +1009,34 @@ EXPORT_SYMBOL(arcnet_interrupt);static void arcnet_rx (struct net_device *dev,int bufnum) {struct arcnet_local *lp =netdev_priv (dev); -struct archdr pkt; +union { +struct archdr pkt; +char buf[512 ]; + } rxdata;struct arc_rfc1201 *soft;int length, ofs; - soft = &pkt.soft.rfc1201; + soft = &rxdata.pkt.soft.rfc1201; - lp->hw.copy_from_card (dev, bufnum,0 , &pkt,ARC_HDR_SIZE ); -if (pkt.hard.offset[0 ]) { - ofs = pkt.hard.offset[0 ]; + lp->hw.copy_from_card (dev, bufnum,0 , &rxdata.pkt,ARC_HDR_SIZE ); +if (rxdata.pkt.hard.offset[0 ]) { + ofs = rxdata.pkt.hard.offset[0 ]; length =256 - ofs; }else { - ofs = pkt.hard.offset[1 ]; + ofs = rxdata.pkt.hard.offset[1 ]; length =512 - ofs; }/* get the full header, if possible */ -if (sizeof (pkt.soft) <= length) { - lp->hw.copy_from_card (dev, bufnum, ofs, soft,sizeof (pkt.soft)); +if (sizeof (rxdata.pkt.soft) <= length) { + lp->hw.copy_from_card (dev, bufnum, ofs, soft,sizeof (rxdata.pkt.soft)); }else { -memset (&pkt.soft,0 ,sizeof (pkt.soft)); +memset (&rxdata.pkt.soft,0 ,sizeof (rxdata.pkt.soft)); lp->hw.copy_from_card (dev, bufnum, ofs, soft, length); }arc_printk (D_DURING , dev,"Buffer #%d: received packet from %02Xh to %02Xh (%d+4 bytes)\n" , - bufnum, pkt.hard.source, pkt.hard.dest, length); + bufnum, rxdata.pkt.hard.source, rxdata.pkt.hard.dest, length); dev->stats.rx_packets++; dev->stats.rx_bytes += length +ARC_HDR_SIZE ;
@@ -1042,13 +1045,13 @@ static void arcnet_rx(struct net_deviceif (arc_proto_map[soft->proto]->is_ip) {if (BUGLVL (D_PROTO )) {struct ArcProto - *oldp = arc_proto_map[lp->default_proto[pkt.hard.source]], + *oldp = arc_proto_map[lp->default_proto[rxdata.pkt.hard.source]], *newp = arc_proto_map[soft->proto];if (oldp != newp) {arc_printk (D_PROTO , dev,"got protocol %02Xh; encap for host %02Xh is now '%c' (was '%c')\n" , - soft->proto, pkt.hard.source, + soft->proto, rxdata.pkt.hard.source, newp->suffix, oldp->suffix); } }
@@ -1057,10 +1060,10 @@ static void arcnet_rx(struct net_device lp->default_proto[0 ] = soft->proto;/* in striking contrast, the following isn't a hack. */ - lp->default_proto[pkt.hard.source] = soft->proto; + lp->default_proto[rxdata.pkt.hard.source] = soft->proto; }/* call the protocol-specific receiver. */ - arc_proto_map[soft->proto]->rx (dev, bufnum, &pkt, length); + arc_proto_map[soft->proto]->rx (dev, bufnum, &rxdata.pkt, length); } static void null_rx(struct net_device *dev, int bufnum,
Greg Kroah-Hartman
maintainerPATCH 2/99 HID: prodikeys: Fix general protection fault during probe
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 98375b86c79137416e9fd354177b85e768c16e56 upstream.
The syzbot fuzzer provoked a general protection fault in the hid-prodikeys driver:
kasan: CONFIG_KASAN_INLINE enabled
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] SMP KASAN CPU: 0 PID: 12 Comm: kworker/0:1 Not tainted 5.3.0-rc5+ #28 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: usb_hub_wq hub_event RIP: 0010:pcmidi_submit_output_report drivers/hid/hid-prodikeys.c:300 [inline] RIP: 0010:pcmidi_set_operational drivers/hid/hid-prodikeys.c:558 [inline] RIP: 0010:pcmidi_snd_initialise drivers/hid/hid-prodikeys.c:686 [inline] RIP: 0010:pk_probe+0xb51/0xfd0 drivers/hid/hid-prodikeys.c:836 Code: 0f 85 50 04 00 00 48 8b 04 24 4c 89 7d 10 48 8b 58 08 e8 b2 53 e4 fc
48 8b 54 24 20 48 b8 00 00 00 00 00 fc ff df 48 c1 ea 03 <80> 3c 02 00 0f 85 13 04 00 00 48 ba 00 00 00 00 00 fc ff df 49 8b
The problem is caused by the fact that pcmidi_get_output_report() will return an error if the HID device doesn't provide the right sort of output report, but pcmidi_set_operational() doesn't bother to check the return code and assumes the function call always succeeds.
This patch adds the missing check and aborts the probe operation if necessary.
--- drivers/hid/hid-prodikeys.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/hid/hid-prodikeys.c +10 -2
@@ -556,10 +556,14 @@ static void pcmidi_setup_extra_keys(static int pcmidi_set_operational (struct pcmidi_snd *pm) { +int rc; +if (pm->ifnum !=1 )return 0 ;/* only set up ONCE for interace 1 */ -pcmidi_get_output_report (pm); + rc =pcmidi_get_output_report (pm); +if (rc <0 ) +return rc;pcmidi_submit_output_report (pm,0xc1 );return 0 ; }
@@ -688,7 +692,11 @@ static int pcmidi_snd_initialise(structspin_lock_init (&pm->rawmidi_in_lock);init_sustain_timers (pm); -pcmidi_set_operational (pm); + err =pcmidi_set_operational (pm); +if (err <0 ) { +pk_error ("failed to find output report\n" ); + goto fail_register; + }/* register it */ err =snd_card_register (card);
Greg Kroah-Hartman
maintainerPATCH 18/99 drm: Flush output polling on shutdown
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
[ Upstream commit 3b295cb1a411d9c82bbfaa66bc17a8508716ed07 ]
We need to mark the output polling as disabled to prevent concurrent irqs from queuing new work as shutdown the probe -- causing that work to execute after we have freed the structs:
<4> [341.846490] DEBUG_LOCKS_WARN_ON(mutex_is_locked(lock))
<4> [341.846497] WARNING: CPU: 3 PID: 3300 at kernel/locking/mutex-debug.c:103 mutex_destroy+0x49/0x50
<4> [341.846508] Modules linked in: i915(-) vgem thunderbolt snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic mei_hdcp x86_pkg_temp_thermal coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_codec snd_hwdep snd_hda_core snd_pcm mcs7830 btusb usbnet btrtl mii btbcm btintel bluetooth ecdh_generic ecc mei_me mei prime_numbers i2c_hid pinctrl_sunrisepoint pinctrl_intel [last unloaded: i915]
<4> [341.846546] CPU: 3 PID: 3300 Comm: i915_module_loa Tainted: G U 5.2.0-rc2-CI-CI_DRM_6175+ #1
<4> [341.846553] Hardware name: Dell Inc. XPS 13 9360/0823VW, BIOS 2.9.0 07/09/2018
<4> [341.846560] RIP: 0010:mutex_destroy+0x49/0x50
<4> [341.846565] Code: 00 00 5b c3 e8 a8 9f 3b 00 85 c0 74 ed 8b 05 3e 55 23 01 85 c0 75 e3 48 c7 c6 00 d0 08 82 48 c7 c7 a8 aa 07 82 e8 e7 08 fa ff <0f> 0b eb cc 0f 1f 00 48 b8 11 11 11 11 11 11 11 11 48 89 76 20 48
<4> [341.846578] RSP: 0018:ffffc900006cfdb0 EFLAGS: 00010286
<4> [341.846583] RAX: 0000000000000000 RBX: ffff88826759a168 RCX: 0000000000000000
<4> [341.846589] RDX: 0000000000000002 RSI: 0000000000000000 RDI: ffffffff8112844c
<4> [341.846595] RBP: ffff8882708fa548 R08: 0000000000000000 R09: 0000000000039600
<4> [341.846601] R10: 0000000000000000 R11: 0000000000000ce4 R12: ffffffffa07de1e0
<4> [341.846607] R13: 0000000000000000 R14: 0000000000000000 R15: ffffffffa07de2d0
<4> [341.846613] FS: 00007f62b5ae0e40(0000) GS:ffff888276380000(0000) knlGS:0000000000000000
<4> [341.846620] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
<4> [341.846626] CR2: 000055a4e064f4a0 CR3: 0000000266b16006 CR4: 00000000003606e0
<4> [341.846632] Call Trace:
<4> [341.846639] drm_fb_helper_fini.part.17+0xb3/0x100 <4> [341.846682] intel_fbdev_fini+0x20/0x80 [i915] <4> [341.846722] intel_modeset_cleanup+0x9a/0x140 [i915] <4> [341.846750] i915_driver_unload+0xa3/0x100 [i915] <4> [341.846778] i915_pci_remove+0x19/0x30 [i915] <4> [341.846784] pci_device_remove+0x36/0xb0 <4> [341.846790] device_release_driver_internal+0xd3/0x1b0 <4> [341.846795] driver_detach+0x3f/0x80 <4> [341.846800] bus_remove_driver+0x53/0xd0 <4> [341.846805] pci_unregister_driver+0x25/0xa0 <4> [341.846843] i915_exit+0x16/0x1c [i915] <4> [341.846849] __se_sys_delete_module+0x162/0x210 <4> [341.846855] ? trace_hardirqs_off_thunk+0x1a/0x1c <4> [341.846859] ? do_syscall_64+0xd/0x1c0 <4> [341.846864] do_syscall_64+0x55/0x1c0 <4> [341.846869] entry_SYSCALL_64_after_hwframe+0x49/0xbe
<4> [341.846875] RIP: 0033:0x7f62b51871b7
<4> [341.846881] Code: 73 01 c3 48 8b 0d d1 8c 2c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 b8 b0 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d a1 8c 2c 00 f7 d8 64 89 01 48 <4> [341.846897] RSP: 002b:00007ffe7a227138 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0
<4> [341.846904] RAX: ffffffffffffffda RBX: 00007ffe7a2272b0 RCX: 00007f62b51871b7
<4> [341.846910] RDX: 0000000000000001 RSI: 0000000000000800 RDI: 0000557cd6b55948
<4> [341.846916] RBP: 0000557cd6b558e0 R08: 0000557cd6b5594c R09: 00007ffe7a227160
<4> [341.846922] R10: 00007ffe7a226134 R11: 0000000000000206 R12: 0000000000000000
<4> [341.846927] R13: 00007ffe7a227820 R14: 0000000000000000 R15: 0000000000000000
<4> [341.846936] irq event stamp: 3547847
<4> [341.846940] hardirqs last enabled at (3547847): [<ffffffff819aad2c>] _raw_spin_unlock_irqrestore+0x4c/0x60
<4> [341.846949] hardirqs last disabled at (3547846): [<ffffffff819aab9d>] _raw_spin_lock_irqsave+0xd/0x50
<4> [341.846957] softirqs last enabled at (3547376): [<ffffffff81c0033a>] __do_softirq+0x33a/0x4b9
<4> [341.846966] softirqs last disabled at (3547367): [<ffffffff810b6379>] irq_exit+0xa9/0xc0
<4> [341.846973] WARNING: CPU: 3 PID: 3300 at kernel/locking/mutex-debug.c:103 mutex_destroy+0x49/0x50
<4> [341.846980] ---[ end trace ba94ca8952ba970e ]---
<7> [341.866547] [drm:intel_dp_detect [i915]] MST support? port A: no, sink: no, modparam: yes
<7> [341.890480] [drm:drm_add_display_info] non_desktop set to 0
<7> [341.890530] [drm:drm_add_edid_modes] ELD: no CEA Extension found
<7> [341.890537] [drm:drm_add_display_info] non_desktop set to 0
<7> [341.890578] [drm:drm_helper_probe_single_connector_modes] [CONNECTOR:86:eDP-1] probed modes :
<7> [341.890589] [drm:drm_mode_debug_printmodeline] Modeline "3200x1800": 60 373250 3200 3248 3280 3360 1800 1803 1808 1852 0x48 0xa
<7> [341.890602] [drm:drm_mode_debug_printmodeline] Modeline "3200x1800": 48 298600 3200 3248 3280 3360 1800 1803 1808 1852 0x40 0xa
<4> [341.890628] general protection fault: 0000 [#1] PREEMPT SMP PTI
<4> [341.890636] CPU: 0 PID: 508 Comm: kworker/0:4 Tainted: G U W 5.2.0-rc2-CI-CI_DRM_6175+ #1
<4> [341.890646] Hardware name: Dell Inc. XPS 13 9360/0823VW, BIOS 2.9.0 07/09/2018
<4> [341.890655] Workqueue: events output_poll_execute
<4> [341.890663] RIP: 0010:drm_setup_crtcs+0x13e/0xbe0
<4> [341.890669] Code: 00 41 8b 44 24 58 85 c0 0f 8e f9 01 00 00 44 8b 6c 24 20 44 8b 74 24 28 31 db 31 ed 49 8b 44 24 60 48 63 d5 44 89 ee 83 c5 01 <48> 8b 04 d0 44 89 f2 48 8b 38 48 8b 87 88 01 00 00 48 8b 40 20 e8 <4> [341.890686] RSP: 0018:ffffc9000033fd40 EFLAGS: 00010202
<4> [341.890692] RAX: 6b6b6b6b6b6b6b6b RBX: 0000000000000002 RCX: 0000000000000000
<4> [341.890700] RDX: 0000000000000001 RSI: 0000000000000c80 RDI: 00000000ffffffff
<4> [341.890707] RBP: 0000000000000002 R08: 0000000000000000 R09: 0000000000000000
<4> [341.890715] R10: 0000000000000c80 R11: 0000000000000000 R12: ffff888267599fe8
<4> [341.890722] R13: 0000000000000c80 R14: 0000000000000708 R15: 0000000000000007
<4> [341.890730] FS: 0000000000000000(0000) GS:ffff888276200000(0000) knlGS:0000000000000000
<4> [341.890739] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
<4> [341.890745] CR2: 000055a4e064f4a0 CR3: 000000026d234003 CR4: 00000000003606f0
<4> [341.890752] Call Trace:
<4> [341.890760] drm_fb_helper_hotplug_event.part.24+0x89/0xb0 <4> [341.890768] drm_kms_helper_hotplug_event+0x21/0x30 <4> [341.890774] output_poll_execute+0x9d/0x1a0 <4> [341.890782] process_one_work+0x245/0x610 <4> [341.890790] worker_thread+0x37/0x380 <4> [341.890796] ? process_one_work+0x610/0x610 <4> [341.890802] kthread+0x119/0x130 <4> [341.890808] ? kthread_park+0x80/0x80 <4> [341.890815] ret_from_fork+0x3a/0x50
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109964
--- drivers/gpu/drm/drm_probe_helper.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_probe_helper.c +8 -1
@@ -338,6 +338,9 @@ static void output_poll_execute(struct work_struct *work)enum drm_connector_status old_status;bool repoll = false, changed; +if (!dev->mode_config.poll_enabled) +return ; +/* Pick up any changes detected by the probe functions. */ changed = dev->mode_config.delayed_event; dev->mode_config.delayed_event = false;
@@ -501,7 +504,11 @@ EXPORT_SYMBOL(drm_kms_helper_poll_init);*/ void drm_kms_helper_poll_fini (struct drm_device *dev) { -drm_kms_helper_poll_disable (dev); +if (!dev->mode_config.poll_enabled) +return ; + + dev->mode_config.poll_enabled = false; +cancel_delayed_work_sync (&dev->mode_config.output_poll_work); }EXPORT_SYMBOL (drm_kms_helper_poll_fini);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/99 cdc_ncm: fix divide-by-zero caused by invalid wMaxPacketSize
In reply to Greg Kroah-HartmanFrom: Bjørn Mork <[email protected]>
[ Upstream commit 3fe4b3351301660653a2bc73f2226da0ebd2b95e ]
Endpoints with zero wMaxPacketSize are not usable for transferring data. Ignore such endpoints when looking for valid in, out and status pipes, to make the driver more robust against invalid and meaningless descriptors.
The wMaxPacketSize of the out pipe is used as divisor. So this change fixes a divide-by-zero bug.
--- drivers/net/usb/cdc_ncm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/usb/cdc_ncm.c +5 -1
@@ -636,8 +636,12 @@ cdc_ncm_find_endpoints(struct usbnet *deu8 ep;for (ep =0 ; ep < intf->cur_altsetting->desc.bNumEndpoints; ep++) { - e = intf->cur_altsetting->endpoint + ep; + +/* ignore endpoints which cannot transfer data */ +if (!usb_endpoint_maxp (&e->desc)) +continue ; +switch (e->desc.bmAttributes &USB_ENDPOINT_XFERTYPE_MASK ) {case USB_ENDPOINT_XFER_INT :if (usb_endpoint_dir_in (&e->desc)) {
Greg Kroah-Hartman
maintainerPATCH 25/99 skge: fix checksum byte order
In reply to Greg Kroah-HartmanFrom: Stephen Hemminger <[email protected]>
[ Upstream commit 5aafeb74b5bb65b34cc87c7623f9fa163a34fa3b ]
Running old skge driver on PowerPC causes checksum errors because hardware reported 1's complement checksum is in little-endian byte order.
--- drivers/net/ethernet/marvell/skge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/skge.c +1 -1
@@ -3114,7 +3114,7 @@ static struct sk_buff *skge_rx_get(strucskb_put (skb, len);if (dev->features &NETIF_F_RXCSUM ) { - skb->csum = csum; + skb->csum =le16_to_cpu (csum); skb->ip_summed =CHECKSUM_COMPLETE ; }
Greg Kroah-Hartman
maintainerPATCH 26/99 usbnet: ignore endpoints with invalid wMaxPacketSize
In reply to Greg Kroah-HartmanFrom: Bjørn Mork <[email protected]>
[ Upstream commit 8d3d7c2029c1b360f1a6b0a2fca470b57eb575c0 ]
Endpoints with zero wMaxPacketSize are not usable for transferring data. Ignore such endpoints when looking for valid in, out and status pipes, to make the drivers more robust against invalid and meaningless descriptors.
The wMaxPacketSize of these endpoints are used for memory allocations and as divisors in many usbnet minidrivers. Avoiding zero is therefore critical.
--- drivers/net/usb/usbnet.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/usb/usbnet.c +5 -0
@@ -115,6 +115,11 @@ int usbnet_get_endpoints(struct usbnet *int intr =0 ; e = alt->endpoint + ep; + +/* ignore endpoints which cannot transfer data */ +if (!usb_endpoint_maxp (&e->desc)) +continue ; +switch (e->desc.bmAttributes) {case USB_ENDPOINT_XFER_INT :if (!usb_endpoint_dir_in (&e->desc))
Greg Kroah-Hartman
maintainerPATCH 27/99 usbnet: sanity checking of packet sizes and device mtu
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
[ Upstream commit 280ceaed79f18db930c0cc8bb21f6493490bf29c ]
After a reset packet sizes and device mtu can change and need to be reevaluated to calculate queue sizes. Malicious devices can set this to zero and we divide by it. Introduce sanity checking.
--- drivers/net/usb/usbnet.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/usbnet.c +3 -0
@@ -352,6 +352,8 @@ void usbnet_update_max_qlen(struct usbne {enum usb_device_speed speed = dev->udev->speed; +if (!dev->rx_urb_size || !dev->hard_mtu) + goto insanity;switch (speed) {case USB_SPEED_HIGH : dev->rx_qlen =MAX_QUEUE_MEMORY / dev->rx_urb_size;
@@ -367,6 +369,7 @@ void usbnet_update_max_qlen(struct usbne dev->tx_qlen =5 *MAX_QUEUE_MEMORY / dev->hard_mtu;break ;default : +insanity: dev->rx_qlen = dev->tx_qlen =4 ; } }
Greg Kroah-Hartman
maintainerPATCH 28/99 mISDN: enforce CAP_NET_RAW for raw sockets
In reply to Greg Kroah-HartmanFrom: Ori Nimron <[email protected]>
[ Upstream commit b91ee4aa2a2199ba4d4650706c272985a5a32d80 ]
When creating a raw AF_ISDN socket, CAP_NET_RAW needs to be checked first.
--- drivers/isdn/mISDN/socket.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/isdn/mISDN/socket.c +2 -0
@@ -763,6 +763,8 @@ base_sock_create(struct net *net, structif (sock->type !=SOCK_RAW )return -ESOCKTNOSUPPORT ; +if (!capable (CAP_NET_RAW )) +return -EPERM ; sk =sk_alloc (net,PF_ISDN ,GFP_KERNEL , &mISDN_proto, kern);if (!sk)
Greg Kroah-Hartman
maintainerPATCH 29/99 appletalk: enforce CAP_NET_RAW for raw sockets
In reply to Greg Kroah-HartmanFrom: Ori Nimron <[email protected]>
[ Upstream commit 6cc03e8aa36c51f3b26a0d21a3c4ce2809c842ac ]
When creating a raw AF_APPLETALK socket, CAP_NET_RAW needs to be checked first.
--- net/appletalk/ddp.c | 5 +++++ 1 file changed, 5 insertions(+)
net/appletalk/ddp.c +5 -0
@@ -1029,6 +1029,11 @@ static int atalk_create(struct net *net,*/ if (sock->type !=SOCK_RAW && sock->type !=SOCK_DGRAM ) goto out; + + rc = -EPERM ; +if (sock->type ==SOCK_RAW && !kern && !capable (CAP_NET_RAW )) + goto out; + rc = -ENOMEM ; sk =sk_alloc (net,PF_APPLETALK ,GFP_KERNEL , &ddp_proto, kern);if (!sk)
Greg Kroah-Hartman
maintainerPATCH 30/99 ax25: enforce CAP_NET_RAW for raw sockets
In reply to Greg Kroah-HartmanFrom: Ori Nimron <[email protected]>
[ Upstream commit 0614e2b73768b502fc32a75349823356d98aae2c ]
When creating a raw AF_AX25 socket, CAP_NET_RAW needs to be checked first.
--- net/ax25/af_ax25.c | 2 ++ 1 file changed, 2 insertions(+)
net/ax25/af_ax25.c +2 -0
@@ -859,6 +859,8 @@ static int ax25_create(struct net *net,break ;case SOCK_RAW : +if (!capable (CAP_NET_RAW )) +return -EPERM ;break ;default :return -ESOCKTNOSUPPORT ;
Greg Kroah-Hartman
maintainerPATCH 31/99 ieee802154: enforce CAP_NET_RAW for raw sockets
In reply to Greg Kroah-HartmanFrom: Ori Nimron <[email protected]>
[ Upstream commit e69dbd4619e7674c1679cba49afd9dd9ac347eef ]
When creating a raw AF_IEEE802154 socket, CAP_NET_RAW needs to be checked first.
--- net/ieee802154/socket.c | 3 +++ 1 file changed, 3 insertions(+)
net/ieee802154/socket.c +3 -0
@@ -999,6 +999,9 @@ static int ieee802154_create(struct netswitch (sock->type) {case SOCK_RAW : + rc = -EPERM ; +if (!capable (CAP_NET_RAW )) + goto out; proto = &ieee802154_raw_prot; ops = &ieee802154_raw_ops;break ;
Greg Kroah-Hartman
maintainerPATCH 32/99 nfc: enforce CAP_NET_RAW for raw sockets
In reply to Greg Kroah-HartmanFrom: Ori Nimron <[email protected]>
[ Upstream commit 3a359798b176183ef09efb7a3dc59abad1cc7104 ]
When creating a raw AF_NFC socket, CAP_NET_RAW needs to be checked first.
--- net/nfc/llcp_sock.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/nfc/llcp_sock.c +5 -2
@@ -1005,10 +1005,13 @@ static int llcp_sock_create(struct net * sock->type != SOCK_RAW)return -ESOCKTNOSUPPORT ; -if (sock->type ==SOCK_RAW ) +if (sock->type ==SOCK_RAW ) { +if (!capable (CAP_NET_RAW )) +return -EPERM ; sock->ops = &llcp_rawsock_ops; -else + }else { sock->ops = &llcp_sock_ops; + } sk =nfc_llcp_sock_alloc (sock, sock->type,GFP_ATOMIC , kern);if (sk ==NULL )
Greg Kroah-Hartman
maintainerPATCH 33/99 ALSA: hda: Flush interrupts on disabling
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
[ Upstream commit caa8422d01e983782548648e125fd617cadcec3f ]
I was looking at
<4> [241.835158] general protection fault: 0000 [#1] PREEMPT SMP PTI
<4> [241.835181] CPU: 1 PID: 214 Comm: kworker/1:3 Tainted: G U 5.2.0-CI-CI_DRM_6509+ #1
<4> [241.835199] Hardware name: Dell Inc. OptiPlex 745 /0GW726, BIOS 2.3.1 05/21/2007
<4> [241.835234] Workqueue: events snd_hdac_bus_process_unsol_events [snd_hda_core]
<4> [241.835256] RIP: 0010:input_handle_event+0x16d/0x5e0
<4> [241.835270] Code: 48 8b 93 58 01 00 00 8b 52 08 89 50 04 8b 83 f8 06 00 00 48 8b 93 00 07 00 00 8d 70 01 48 8d 04 c2 83 e1 08 89 b3 f8 06 00 00 <66> 89 28 66 44 89 60 02 44 89 68 04 8b 93 f8 06 00 00 0f 84 fd fe <4> [241.835304] RSP: 0018:ffffc9000019fda0 EFLAGS: 00010046
<4> [241.835317] RAX: 6b6b6b6ec6c6c6c3 RBX: ffff8880290fefc8 RCX: 0000000000000000
<4> [241.835332] RDX: 000000006b6b6b6b RSI: 000000006b6b6b6c RDI: 0000000000000046
<4> [241.835347] RBP: 0000000000000005 R08: 0000000000000000 R09: 0000000000000001
<4> [241.835362] R10: ffffc9000019faa0 R11: 0000000000000000 R12: 0000000000000004
<4> [241.835377] R13: 0000000000000000 R14: ffff8880290ff1d0 R15: 0000000000000293
<4> [241.835392] FS: 0000000000000000(0000) GS:ffff88803de80000(0000) knlGS:0000000000000000
<4> [241.835409] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
<4> [241.835422] CR2: 00007ffe9a99e9b7 CR3: 000000002f588000 CR4: 00000000000006e0
<4> [241.835436] Call Trace:
<4> [241.835449] input_event+0x45/0x70 <4> [241.835464] snd_jack_report+0xdc/0x100 <4> [241.835490] snd_hda_jack_report_sync+0x83/0xc0 [snd_hda_codec] <4> [241.835512] snd_hdac_bus_process_unsol_events+0x5a/0x70 [snd_hda_core] <4> [241.835530] process_one_work+0x245/0x610
which has the hallmarks of a worker queued from interrupt after it was supposedly cancelled (note the POISON_FREE), and I could not see where the interrupt would be flushed on shutdown so added the likely suspects.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111174
--- sound/hda/hdac_controller.c | 2 ++ sound/pci/hda/hda_intel.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
sound/hda/hdac_controller.c +2 -0
@@ -340,6 +340,8 @@ static void azx_int_disable(struct hdac_bus *bus)list_for_each_entry (azx_dev, &bus->stream_list, list)snd_hdac_stream_updateb (azx_dev,SD_CTL ,SD_INT_MASK ,0 ); +synchronize_irq (bus->irq); +/* disable SIE for all streams */ snd_hdac_chip_writeb (bus,INTCTL ,0 );
sound/pci/hda/hda_intel.c +1 -1
@@ -1274,9 +1274,9 @@ static int azx_free(struct azx *chip) }if (bus->chip_init) { +azx_stop_chip (chip);azx_clear_irq_pending (chip);azx_stop_all_streams (chip); -azx_stop_chip (chip); }if (bus->irq >=0 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/99 ASoC: sgtl5000: Fix charge pump source assignment
In reply to Greg Kroah-HartmanFrom: Oleksandr Suvorov <[email protected]>
[ Upstream commit b6319b061ba279577fd7030a9848fbd6a17151e3 ]
If VDDA != VDDIO and any of them is greater than 3.1V, charge pump source can be assigned automatically [1].
[1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf
--- sound/soc/codecs/sgtl5000.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
sound/soc/codecs/sgtl5000.c +10 -5
@@ -1166,12 +1166,17 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) SGTL5000_INT_OSC_EN);/* Enable VDDC charge pump */ ana_pwr |=SGTL5000_VDDC_CHRGPMP_POWERUP ; - }else if (vddio >=3100 && vdda >=3100 ) { + }else { ana_pwr &= ~SGTL5000_VDDC_CHRGPMP_POWERUP ; -/* VDDC use VDDIO rail */ - lreg_ctrl |=SGTL5000_VDDC_ASSN_OVRD ; - lreg_ctrl |=SGTL5000_VDDC_MAN_ASSN_VDDIO << -SGTL5000_VDDC_MAN_ASSN_SHIFT ; +/* +* if vddio == vdda the source of charge pump should be +* assigned manually to VDDIO +*/ +if (vddio == vdda) { + lreg_ctrl |=SGTL5000_VDDC_ASSN_OVRD ; + lreg_ctrl |=SGTL5000_VDDC_MAN_ASSN_VDDIO << +SGTL5000_VDDC_MAN_ASSN_SHIFT ; + } }snd_soc_write (codec,SGTL5000_CHIP_LINREG_CTRL , lreg_ctrl);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/99 dmaengine: bcm2835: Print error in case setting DMA mask fails
In reply to Greg Kroah-HartmanFrom: Stefan Wahren <[email protected]>
[ Upstream commit 72503b25ee363827aafffc3e8d872e6a92a7e422 ]
During enabling of the RPi 4, we found out that the driver doesn't provide a helpful error message in case setting DMA mask fails. So add one.
--- drivers/dma/bcm2835-dma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma/bcm2835-dma.c +3 -1
@@ -595,8 +595,10 @@ static int bcm2835_dma_probe(struct platform_device *pdev) pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; rc =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 )); -if (rc) +if (rc) { +dev_err (&pdev->dev,"Unable to set DMA mask\n" );return rc; + } od =devm_kzalloc (&pdev->dev,sizeof (*od),GFP_KERNEL );if (!od)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/99 leds: leds-lp5562 allow firmware files up to the maximum length
In reply to Greg Kroah-HartmanFrom: Nick Stoughton <[email protected]>
[ Upstream commit ed2abfebb041473092b41527903f93390d38afa7 ]
Firmware files are in ASCII, using 2 hex characters per byte. The maximum length of a firmware string is therefore
16 (commands) * 2 (bytes per command) * 2 (characters per byte) = 64
--- drivers/leds/leds-lp5562.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/leds/leds-lp5562.c +5 -1
@@ -263,7 +263,11 @@ static void lp5562_firmware_loaded(struct lp55xx_chip *chip) {const struct firmware *fw = chip->fw; -if (fw->size >LP5562_PROGRAM_LENGTH ) { +/* +* the firmware is encoded in ascii hex character, with 2 chars +* per byte +*/ +if (fw->size > (LP5562_PROGRAM_LENGTH *2 )) {dev_err (&chip->cl->dev,"firmware data size overflow: %zu\n" , fw->size);return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/99 media: dib0700: fix link error for dibx000_i2c_set_speed
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 765bb8610d305ee488b35d07e2a04ae52fb2df9c ]
When CONFIG_DVB_DIB9000 is disabled, we can still compile code that now fails to link against dibx000_i2c_set_speed:
drivers/media/usb/dvb-usb/dib0700_devices.o: In function `dib01x0_pmu_update.constprop.7':
dib0700_devices.c:(.text.unlikely+0x1c9c): undefined reference to `dibx000_i2c_set_speed'
The call sites are both through dib01x0_pmu_update(), which gets passed an 'i2c' pointer from dib9000_get_i2c_master(), which has returned NULL. Checking this pointer seems to be a good idea anyway, and it avoids the link failure in most cases.
Sean Young found another case that is not fixed by that, where certain gcc versions leave an unused function in place that causes the link error, but adding an explict IS_ENABLED() check also solves this.
--- drivers/media/usb/dvb-usb/dib0700_devices.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/media/usb/dvb-usb/dib0700_devices.c +8 -0
@@ -2418,9 +2418,13 @@ static int dib9090_tuner_attach(struct dvb_usb_adapter *adap) 8, 0x0486, }; +if (!IS_ENABLED (CONFIG_DVB_DIB9000 )) +return -ENODEV ;if (dvb_attach (dib0090_fw_register, adap->fe_adap[0 ].fe, i2c, &dib9090_dib0090_config) ==NULL )return -ENODEV ; i2c =dib9000_get_i2c_master (adap->fe_adap[0 ].fe,DIBX000_I2C_INTERFACE_GPIO_1_2 ,0 ); +if (!i2c) +return -ENODEV ;if (dib01x0_pmu_update (i2c, data_dib190,10 ) !=0 )return -ENODEV ;dib0700_set_i2c_speed (adap->dev,1500 );
@@ -2496,10 +2500,14 @@ static int nim9090md_tuner_attach(struct dvb_usb_adapter *adap)0 ,0x00ef , 8, 0x0406, }; +if (!IS_ENABLED (CONFIG_DVB_DIB9000 )) +return -ENODEV ; i2c =dib9000_get_tuner_interface (adap->fe_adap[0 ].fe);if (dvb_attach (dib0090_fw_register, adap->fe_adap[0 ].fe, i2c, &nim9090md_dib0090_config[0 ]) ==NULL )return -ENODEV ; i2c =dib9000_get_i2c_master (adap->fe_adap[0 ].fe,DIBX000_I2C_INTERFACE_GPIO_1_2 ,0 ); +if (!i2c) +return -ENODEV ;if (dib01x0_pmu_update (i2c, data_dib190,10 ) <0 )return -ENODEV ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/99 media: hdpvr: Add device num check and handling
In reply to Greg Kroah-HartmanFrom: Luke Nowakowski-Krijger <[email protected]>
[ Upstream commit d4a6a9537bc32811486282206ecfb7c53754b74d ]
Add hdpvr device num check and error handling
We need to increment the device count atomically before we checkout a device to make sure that we do not reach the max count, otherwise we get out-of-bounds errors as reported by syzbot.
--- drivers/media/usb/hdpvr/hdpvr-core.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/media/usb/hdpvr/hdpvr-core.c +11 -1
@@ -278,6 +278,7 @@ static int hdpvr_probe(struct usb_interface *interface,#endif size_t buffer_size;int i; +int dev_num;int retval = -ENOMEM ;/* allocate memory for our device state and initialize it */
@@ -386,8 +387,17 @@ static int hdpvr_probe(struct usb_interface *interface, }#endif + dev_num =atomic_inc_return (&dev_nr); +if (dev_num >=HDPVR_MAX ) { +v4l2_err (&dev->v4l2_dev, +"max device number reached, device register failed\n" ); +atomic_dec (&dev_nr); + retval = -ENODEV ; + goto reg_fail; + } + retval =hdpvr_register_videodev (dev, &interface->dev, - video_nr[atomic_inc_return (&dev_nr)]); + video_nr[dev_num]);if (retval <0 ) {v4l2_err (&dev->v4l2_dev,"registering videodev failed\n" ); goto reg_fail;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/99 HID: logitech: Fix general protection fault caused by Logitech driver
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 5f9242775bb61f390f0885f23fc16397262c7538 upstream.
The syzbot fuzzer found a general protection fault in the HID subsystem:
kasan: CONFIG_KASAN_INLINE enabled
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] SMP KASAN CPU: 0 PID: 3715 Comm: syz-executor.3 Not tainted 5.2.0-rc6+ #15 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:__pm_runtime_resume+0x49/0x180 drivers/base/power/runtime.c:1069 Code: ed 74 d5 fe 45 85 ed 0f 85 9a 00 00 00 e8 6f 73 d5 fe 48 8d bd c1 02 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <0f> b6 04 02 48 89 fa 83 e2 07 38 d0 7f 08 84 c0 0f 85 fe 00 00 00 RSP: 0018:ffff8881d99d78e0 EFLAGS: 00010202 RAX: dffffc0000000000 RBX: 0000000000000020 RCX: ffffc90003f3f000 RDX: 0000000416d8686d RSI: ffffffff82676841 RDI: 00000020b6c3436a RBP: 00000020b6c340a9 R08: ffff8881c6d64800 R09: fffffbfff0e84c25 R10: ffff8881d99d7940 R11: ffffffff87426127 R12: 0000000000000004 R13: 0000000000000000 R14: ffff8881d9b94000 R15: ffffffff897f9048 FS: 00007f047f542700(0000) GS:ffff8881db200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000001b30f21000 CR3: 00000001ca032000 CR4: 00000000001406f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: pm_runtime_get_sync include/linux/pm_runtime.h:226 [inline] usb_autopm_get_interface+0x1b/0x50 drivers/usb/core/driver.c:1707 usbhid_power+0x7c/0xe0 drivers/hid/usbhid/hid-core.c:1234 hid_hw_power include/linux/hid.h:1038 [inline] hidraw_open+0x20d/0x740 drivers/hid/hidraw.c:282 chrdev_open+0x219/0x5c0 fs/char_dev.c:413 do_dentry_open+0x497/0x1040 fs/open.c:778 do_last fs/namei.c:3416 [inline] path_openat+0x1430/0x3ff0 fs/namei.c:3533 do_filp_open+0x1a1/0x280 fs/namei.c:3563 do_sys_open+0x3c0/0x580 fs/open.c:1070 do_syscall_64+0xb7/0x560 arch/x86/entry/common.c:301 entry_SYSCALL_64_after_hwframe+0x49/0xbe
It turns out the fault was caused by a bug in the HID Logitech driver, which violates the requirement that every pathway calling hid_hw_start() must also call hid_hw_stop(). This patch fixes the bug by making sure the requirement is met.
--- drivers/hid/hid-lg.c | 10 ++++++---- drivers/hid/hid-lg4ff.c | 1 - 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/hid/hid-lg.c +6 -4
@@ -706,7 +706,7 @@ static int lg_probe(struct hid_device *hif (!buf) { ret = -ENOMEM ; - goto err_free; + goto err_stop; } ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(cbuf),
@@ -738,9 +738,12 @@ static int lg_probe(struct hid_device *h ret =lg4ff_init (hdev);if (ret) - goto err_free; + goto err_stop;return 0 ; + +err_stop: +hid_hw_stop (hdev); err_free:kfree (drv_data);return ret;
@@ -751,8 +754,7 @@ static void lg_remove(struct hid_devicestruct lg_drv_data *drv_data =hid_get_drvdata (hdev);if (drv_data->quirks &LG_FF4 )lg4ff_deinit (hdev); -else -hid_hw_stop (hdev); +hid_hw_stop (hdev);kfree (drv_data); }
drivers/hid/hid-lg4ff.c +0 -1
@@ -1378,7 +1378,6 @@ int lg4ff_deinit(struct hid_device *hid) } }#endif -hid_hw_stop (hid); drv_data->device_props =NULL ;kfree (entry);
Greg Kroah-Hartman
maintainerPATCH 40/99 sched/core: Fix CPU controller for !RT_GROUP_SCHED
In reply to Greg Kroah-HartmanFrom: Juri Lelli <[email protected]>
[ Upstream commit a07db5c0865799ebed1f88be0df50c581fb65029 ]
On !CONFIG_RT_GROUP_SCHED configurations it is currently not possible to move RT tasks between cgroups to which CPU controller has been attached; but it is oddly possible to first move tasks around and then make them RT (setschedule to FIFO/RR).
E.g.:
# mkdir /sys/fs/cgroup/cpu,cpuacct/group1 # chrt -fp 10 $$ # echo $$ > /sys/fs/cgroup/cpu,cpuacct/group1/tasks bash: echo: write error: Invalid argument # chrt -op 0 $$ # echo $$ > /sys/fs/cgroup/cpu,cpuacct/group1/tasks # chrt -fp 10 $$ # cat /sys/fs/cgroup/cpu,cpuacct/group1/tasks 2345 2598 # chrt -p 2345 pid 2345's current scheduling policy: SCHED_FIFO pid 2345's current scheduling priority: 10
Also, as Michal noted, it is currently not possible to enable CPU controller on unified hierarchy with !CONFIG_RT_GROUP_SCHED (if there are any kernel RT threads in root cgroup, they can't be migrated to the newly created CPU controller's root in cgroup_update_dfl_csses()).
Existing code comes with a comment saying the "we don't support RT-tasks being in separate groups". Such comment is however stale and belongs to pre-RT_GROUP_SCHED times. Also, it doesn't make much sense for !RT_GROUP_ SCHED configurations, since checks related to RT bandwidth are not performed at all in these cases.
Make moving RT tasks between CPU controller groups viable by removing special case check for RT (and DEADLINE) tasks.
--- kernel/sched/core.c | 4 ---- 1 file changed, 4 deletions(-)
kernel/sched/core.c +0 -4
@@ -8339,10 +8339,6 @@ static int cpu_cgroup_can_attach(struct cgroup_taskset *tset)#ifdef CONFIG_RT_GROUP_SCHED if (!sched_rt_can_attach (css_tg (css), task))return -EINVAL ; -#else -/* We don't support RT-tasks being in separate groups */ -if (task->sched_class != &fair_sched_class) -return -EINVAL ;#endif }return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 5/99 HID: hidraw: Fix invalid read in hidraw_ioctl
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 416dacb819f59180e4d86a5550052033ebb6d72c upstream.
The syzbot fuzzer has reported a pair of problems in the hidraw_ioctl() function: slab-out-of-bounds read and use-after-free read. An example of the first:
BUG: KASAN: slab-out-of-bounds in strlen+0x79/0x90 lib/string.c:525 Read of size 1 at addr ffff8881c8035f38 by task syz-executor.4/2833 CPU: 1 PID: 2833 Comm: syz-executor.4 Not tainted 5.3.0-rc2+ #1 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xca/0x13e lib/dump_stack.c:113 print_address_description+0x6a/0x32c mm/kasan/report.c:351 __kasan_report.cold+0x1a/0x33 mm/kasan/report.c:482 kasan_report+0xe/0x12 mm/kasan/common.c:612 strlen+0x79/0x90 lib/string.c:525 strlen include/linux/string.h:281 [inline] hidraw_ioctl+0x245/0xae0 drivers/hid/hidraw.c:446 vfs_ioctl fs/ioctl.c:46 [inline] file_ioctl fs/ioctl.c:509 [inline] do_vfs_ioctl+0xd2d/0x1330 fs/ioctl.c:696 ksys_ioctl+0x9b/0xc0 fs/ioctl.c:713 __do_sys_ioctl fs/ioctl.c:720 [inline] __se_sys_ioctl fs/ioctl.c:718 [inline] __x64_sys_ioctl+0x6f/0xb0 fs/ioctl.c:718 do_syscall_64+0xb7/0x580 arch/x86/entry/common.c:296 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x459829 Code: fd b7 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7
48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 cb b7 fb ff c3 66 2e 0f 1f 84 00 00 00 00
RSP: 002b:00007f7a68f6dc78 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 0000000000459829
RDX: 0000000000000000 RSI: 0000000080404805 RDI: 0000000000000004
RBP: 000000000075bf20 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00007f7a68f6e6d4
R13: 00000000004c21de R14: 00000000004d5620 R15: 00000000ffffffff
The two problems have the same cause: hidraw_ioctl() fails to test whether the device has been removed. This patch adds the missing test.
--- drivers/hid/hidraw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hidraw.c +1 -1
@@ -383,7 +383,7 @@ static long hidraw_ioctl(struct file *fimutex_lock (&minors_lock); dev = hidraw_table[minor]; -if (!dev) { +if (!dev || !dev->exist) { ret = -ENODEV ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 6/99 mtd: cfi_cmdset_0002: Use chip_good() to retry in do_write_oneword()
In reply to Greg Kroah-HartmanFrom: Tokunori Ikegami <[email protected]>
commit 37c673ade35c707d50583b5b25091ff8ebdeafd7 upstream.
As reported by the OpenWRT team, write requests sometimes fail on some platforms.
Currently to check the state chip_ready() is used correctly as described by the flash memory S29GL256P11TFI01 datasheet.
Also chip_good() is used to check if the write is succeeded and it was implemented by the commit fb4a90bfcd6d8 ("[MTD] CFI-0002 - Improve error checking").
But actually the write failure is caused on some platforms and also it can be fixed by using chip_good() to check the state and retry instead. Also it seems that it is caused after repeated about 1,000 times to retry the write one word with the reset command.
By using chip_good() to check the state to be done it can be reduced the retry with reset.
It is depended on the actual flash chip behavior so the root cause is unknown.
--- drivers/mtd/chips/cfi_cmdset_0002.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +12 -6
@@ -1626,29 +1626,35 @@ static int __xipram do_write_oneword(strcontinue ; } -if (time_after (jiffies, timeo) && !chip_ready (map, adr)){ +/* +* We check "time_after" and "!chip_good" before checking +* "chip_good" to avoid the failure due to scheduling. +*/ +if (time_after (jiffies, timeo) && !chip_good (map, adr, datum)) {xip_enable (map, chip, adr);printk (KERN_WARNING "MTD %s(): software timeout\n" , __func__);xip_disable (map, chip, adr); + ret = -EIO ;break ; } -if (chip_ready (map, adr)) +if (chip_good (map, adr, datum))break ;/* Latency issues. Drop the lock, wait a while and retry */ UDELAY (map, chip, adr,1 ); } +/* Did we succeed? */ -if (!chip_good (map, adr, datum)) { +if (ret) {/* reset on all failures. */ map_write ( map,CMD (0xF0 ), chip->start );/* FIXME - should have reset delay before continuing */ -if (++retry_cnt <=MAX_RETRIES ) +if (++retry_cnt <=MAX_RETRIES ) { + ret =0 ; goto retry; - - ret = -EIO ; + } }xip_enable (map, chip, adr); op_done:
Greg Kroah-Hartman
maintainerPATCH 8/99 net: rds: Fix NULL ptr use in rds_tcp_kill_sock
In reply to Greg Kroah-HartmanFrom: Mao Wenan <[email protected]>
After the commit c4e97b06cfdc ("net: rds: force to destroy connection if t_sock is NULL in rds_tcp_kill_sock()."), it introduced null-ptr-deref in rds_tcp_kill_sock as below:
BUG: KASAN: null-ptr-deref on address 0000000000000020 Read of size 8 by task kworker/u16:10/910 CPU: 3 PID: 910 Comm: kworker/u16:10 Not tainted 4.4.178+ #3 Hardware name: linux,dummy-virt (DT) Workqueue: netns cleanup_net Call trace: [<ffffff90080abb50>] dump_backtrace+0x0/0x618 [<ffffff90080ac1a0>] show_stack+0x38/0x60 [<ffffff9008c42b78>] dump_stack+0x1a8/0x230 [<ffffff90085d469c>] kasan_report_error+0xc8c/0xfc0 [<ffffff90085d54a4>] kasan_report+0x94/0xd8 [<ffffff90085d1b28>] __asan_load8+0x88/0x150 [<ffffff9009c9cc2c>] rds_tcp_dev_event+0x734/0xb48 [<ffffff90081eacb0>] raw_notifier_call_chain+0x150/0x1e8 [<ffffff900973fec0>] call_netdevice_notifiers_info+0x90/0x110 [<ffffff9009764874>] netdev_run_todo+0x2f4/0xb08 [<ffffff9009796d34>] rtnl_unlock+0x2c/0x48 [<ffffff9009756484>] default_device_exit_batch+0x444/0x528 [<ffffff9009720498>] ops_exit_list+0x1c0/0x240 [<ffffff9009724a80>] cleanup_net+0x738/0xbf8 [<ffffff90081ca6cc>] process_one_work+0x96c/0x13e0 [<ffffff90081cf370>] worker_thread+0x7e0/0x1910 [<ffffff90081e7174>] kthread+0x304/0x390 [<ffffff9008094280>] ret_from_fork+0x10/0x50
If the first loop add the tc->t_sock = NULL to the tmp_list, 1). list_for_each_entry_safe(tc, _tc, &rds_tcp_conn_list, t_tcp_node)
then the second loop is to find connections to destroy, tc->t_sock might equal NULL, and tc->t_sock->sk happens null-ptr-deref. 2). list_for_each_entry_safe(tc, _tc, &tmp_list, t_tcp_node)
--- net/rds/tcp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/rds/tcp.c +5 -3
@@ -352,9 +352,11 @@ static void rds_tcp_kill_sock(struct net }spin_unlock_irq (&rds_tcp_conn_lock);list_for_each_entry_safe (tc, _tc, &tmp_list, t_tcp_node) { - sk = tc->t_sock->sk; - sk->sk_prot->disconnect (sk,0 ); -tcp_done (sk); +if (tc->t_sock) { + sk = tc->t_sock->sk; + sk->sk_prot->disconnect (sk,0 ); +tcp_done (sk); + }if (tc->conn->c_passive)rds_conn_destroy (tc->conn->c_passive);rds_conn_destroy (tc->conn);
Greg Kroah-Hartman
maintainerPATCH 9/99 ASoC: fsl: Fix of-node refcount unbalance in fsl_ssi_probe_from_dt()
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 2757970f6d0d0a112247600b23d38c0c728ceeb3 upstream.
The node obtained from of_find_node_by_path() has to be unreferenced after the use, but we forgot it for the root node.
--- sound/soc/fsl/fsl_ssi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/fsl/fsl_ssi.c +4 -1
@@ -1374,6 +1374,7 @@ static int fsl_ssi_probe(struct platformstruct fsl_ssi_private *ssi_private;int ret =0 ;struct device_node *np = pdev->dev.of_node; +struct device_node *root;const struct of_device_id *of_id;const char *p, *sprop;const uint32_t *iprop;
@@ -1510,7 +1511,9 @@ static int fsl_ssi_probe(struct platform* device tree. We also pass the address of the CPU DAI driver * structure. */ - sprop =of_get_property (of_find_node_by_path ("/" ),"compatible" ,NULL ); + root =of_find_node_by_path ("/" ); + sprop =of_get_property (root,"compatible" ,NULL ); +of_node_put (root);/* Sometimes the compatible name has a "fsl," prefix, so we strip it. */ p =strrchr (sprop,',' );if (p)
Greg Kroah-Hartman
maintainerPATCH 42/99 x86/apic: Soft disable APIC before initializing it
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 2640da4cccf5cc613bf26f0998b9e340f4b5f69c ]
If the APIC was already enabled on entry of setup_local_APIC() then disabling it soft via the SPIV register makes a lot of sense.
That masks all LVT entries and brings it into a well defined state.
Otherwise previously enabled LVTs which are not touched in the setup function stay unmasked and might surprise the just booting kernel.
--- arch/x86/kernel/apic/apic.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/x86/kernel/apic/apic.c +8 -0
@@ -1265,6 +1265,14 @@ void setup_local_APIC(void)return ; } +/* +* If this comes from kexec/kcrash the APIC might be enabled in +* SPIV. Soft disable it before doing further initialization. +*/ + value =apic_read (APIC_SPIV ); + value &= ~APIC_SPIV_APIC_ENABLED ; +apic_write (APIC_SPIV , value); +#ifdef CONFIG_X86_32 /* Pound the ESR really hard over the head with a big hammer - mbligh */ if (lapic_is_integrated () && apic->disable_esr) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/99 media: gspca: zero usb_buf on error
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 4843a543fad3bf8221cf14e5d5f32d15cee89e84 ]
If reg_r() fails, then gspca_dev->usb_buf was left uninitialized, and some drivers used the contents of that buffer in logic.
This caused several syzbot errors:
https://syzkaller.appspot.com/bug?extid=397fd082ce5143e2f67d
https://syzkaller.appspot.com/bug?extid=1a35278dd0ebfb3a038a
https://syzkaller.appspot.com/bug?extid=06ddf1788cfd048c5e82
I analyzed the gspca drivers and zeroed the buffer where needed.
--- drivers/media/usb/gspca/konica.c | 5 +++++ drivers/media/usb/gspca/nw80x.c | 5 +++++ drivers/media/usb/gspca/ov519.c | 10 ++++++++++ drivers/media/usb/gspca/ov534.c | 5 +++++ drivers/media/usb/gspca/ov534_9.c | 1 + drivers/media/usb/gspca/se401.c | 5 +++++ drivers/media/usb/gspca/sn9c20x.c | 5 +++++ drivers/media/usb/gspca/sonixb.c | 5 +++++ drivers/media/usb/gspca/sonixj.c | 5 +++++ drivers/media/usb/gspca/spca1528.c | 5 +++++ drivers/media/usb/gspca/sq930x.c | 5 +++++ drivers/media/usb/gspca/sunplus.c | 5 +++++ drivers/media/usb/gspca/vc032x.c | 5 +++++ drivers/media/usb/gspca/w996Xcf.c | 5 +++++ 14 files changed, 71 insertions(+)
drivers/media/usb/gspca/konica.c +5 -0
@@ -127,6 +127,11 @@ static void reg_r(struct gspca_dev *gspca_dev, u16 value, u16 index)if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,2 ); } }
drivers/media/usb/gspca/nw80x.c +5 -0
@@ -1584,6 +1584,11 @@ static void reg_r(struct gspca_dev *gspca_dev,if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ );return ; }if (len ==1 )
drivers/media/usb/gspca/ov519.c +10 -0
@@ -2116,6 +2116,11 @@ static int reg_r(struct sd *sd, u16 index) }else {PERR ("reg_r %02x failed %d\n" , index, ret); sd->gspca_dev.usb_err = ret; +/* +* Make sure the result is zeroed to avoid uninitialized +* values. +*/ + gspca_dev->usb_buf[0 ] =0 ; }return ret;
@@ -2142,6 +2147,11 @@ static int reg_r8(struct sd *sd, }else {PERR ("reg_r8 %02x failed %d\n" , index, ret); sd->gspca_dev.usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,8 ); }return ret;
drivers/media/usb/gspca/ov534.c +5 -0
@@ -644,6 +644,11 @@ static u8 ov534_reg_read(struct gspca_dev *gspca_dev, u16 reg)if (ret <0 ) {pr_err ("read failed %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the result is zeroed to avoid uninitialized +* values. +*/ + gspca_dev->usb_buf[0 ] =0 ; }return gspca_dev->usb_buf[0 ]; }
drivers/media/usb/gspca/ov534_9.c +1 -0
@@ -1157,6 +1157,7 @@ static u8 reg_r(struct gspca_dev *gspca_dev, u16 reg)if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +return 0 ; }return gspca_dev->usb_buf[0 ]; }
drivers/media/usb/gspca/se401.c +5 -0
@@ -115,6 +115,11 @@ static void se401_read_req(struct gspca_dev *gspca_dev, u16 req, int silent)pr_err ("read req failed req %#04x error %d\n" , req, err); gspca_dev->usb_err = err; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,READ_REQ_SIZE ); } }
drivers/media/usb/gspca/sn9c20x.c +5 -0
@@ -924,6 +924,11 @@ static void reg_r(struct gspca_dev *gspca_dev, u16 reg, u16 length)if (unlikely (result <0 || result != length)) {pr_err ("Read register %02x failed %d\n" , reg, result); gspca_dev->usb_err = result; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ ); } }
drivers/media/usb/gspca/sonixb.c +5 -0
@@ -466,6 +466,11 @@ static void reg_r(struct gspca_dev *gspca_dev,dev_err (gspca_dev->v4l2_dev.dev,"Error reading register %02x: %d\n" , value, res); gspca_dev->usb_err = res; +/* +* Make sure the result is zeroed to avoid uninitialized +* values. +*/ + gspca_dev->usb_buf[0 ] =0 ; } }
drivers/media/usb/gspca/sonixj.c +5 -0
@@ -1175,6 +1175,11 @@ static void reg_r(struct gspca_dev *gspca_dev,if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ ); } }
drivers/media/usb/gspca/spca1528.c +5 -0
@@ -84,6 +84,11 @@ static void reg_r(struct gspca_dev *gspca_dev,if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ ); } }
drivers/media/usb/gspca/sq930x.c +5 -0
@@ -438,6 +438,11 @@ static void reg_r(struct gspca_dev *gspca_dev,if (ret <0 ) {pr_err ("reg_r %04x failed %d\n" , value, ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ ); } }
drivers/media/usb/gspca/sunplus.c +5 -0
@@ -268,6 +268,11 @@ static void reg_r(struct gspca_dev *gspca_dev,if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ ); } }
drivers/media/usb/gspca/vc032x.c +5 -0
@@ -2919,6 +2919,11 @@ static void reg_r_i(struct gspca_dev *gspca_dev,if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ ); } } static void reg_r(struct gspca_dev *gspca_dev,
drivers/media/usb/gspca/w996Xcf.c +5 -0
@@ -139,6 +139,11 @@ static int w9968cf_read_sb(struct sd *sd) }else {pr_err ("Read SB reg [01] failed\n" ); sd->gspca_dev.usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (sd->gspca_dev.usb_buf,0 ,2 ); }udelay (W9968CF_I2C_BUS_DELAY );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/99 dmaengine: iop-adma: use correct printk format strings
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 00c9755524fbaa28117be774d7c92fddb5ca02f3 ]
When compile-testing on other architectures, we get lots of warnings about incorrect format strings, like:
drivers/dma/iop-adma.c: In function 'iop_adma_alloc_slots':
drivers/dma/iop-adma.c:307:6: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=]
drivers/dma/iop-adma.c: In function 'iop_adma_prep_dma_memcpy':
Quoted 1 line
Quoted 1 line
drivers/dma/iop-adma.c:518:40: warning: format '%u' expects argument of type 'unsigned int', but argument 5 has type 'size_t{aka long unsigned int}' [-Wformat=]
Use %zu for printing size_t as required, and cast the dma_addr_t arguments to 'u64' for printing with %llx. Ideally this should use the %pad format string, but that requires an lvalue argument that doesn't work here.
--- drivers/dma/iop-adma.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/dma/iop-adma.c +9 -9
@@ -126,9 +126,9 @@ static void __iop_adma_slot_cleanup(struct iop_adma_chan *iop_chan)list_for_each_entry_safe (iter, _iter, &iop_chan->chain, chain_node) {pr_debug ("\tcookie: %d slot: %d busy: %d " -"this_desc: %#x next_desc: %#x ack: %d\n" , +"this_desc: %#x next_desc: %#llx ack: %d\n" , iter->async_tx.cookie, iter->idx, busy, - iter->async_tx.phys,iop_desc_get_next_desc (iter), + iter->async_tx.phys, (u64 )iop_desc_get_next_desc (iter),async_tx_test_ack (&iter->async_tx));prefetch (_iter);prefetch (&_iter->async_tx);
@@ -316,9 +316,9 @@ iop_adma_alloc_slots(struct iop_adma_chan *iop_chan, int num_slots,int i;dev_dbg (iop_chan->device->common.dev,"allocated slot: %d " -"(desc %p phys: %#x) slots_per_op %d\n" , +"(desc %p phys: %#llx) slots_per_op %d\n" , iter->idx, iter->hw_desc, - iter->async_tx.phys, slots_per_op); + (u64 )iter->async_tx.phys, slots_per_op);/* pre-ack all but the last descriptor */ if (num_slots != slots_per_op)
@@ -526,7 +526,7 @@ iop_adma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dma_dest,return NULL ;BUG_ON (len >IOP_ADMA_MAX_BYTE_COUNT ); -dev_dbg (iop_chan->device->common.dev,"%s len: %u\n" , +dev_dbg (iop_chan->device->common.dev,"%s len: %zu\n" , __func__, len);spin_lock_bh (&iop_chan->lock);
@@ -559,7 +559,7 @@ iop_adma_prep_dma_xor(struct dma_chan *chan, dma_addr_t dma_dest,BUG_ON (len >IOP_ADMA_XOR_MAX_BYTE_COUNT );dev_dbg (iop_chan->device->common.dev, -"%s src_cnt: %d len: %u flags: %lx\n" , +"%s src_cnt: %d len: %zu flags: %lx\n" , __func__, src_cnt, len, flags);spin_lock_bh (&iop_chan->lock);
@@ -592,7 +592,7 @@ iop_adma_prep_dma_xor_val(struct dma_chan *chan, dma_addr_t *dma_src,if (unlikely (!len))return NULL ; -dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %u\n" , +dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %zu\n" , __func__, src_cnt, len);spin_lock_bh (&iop_chan->lock);
@@ -630,7 +630,7 @@ iop_adma_prep_dma_pq(struct dma_chan *chan, dma_addr_t *dst, dma_addr_t *src,BUG_ON (len >IOP_ADMA_XOR_MAX_BYTE_COUNT );dev_dbg (iop_chan->device->common.dev, -"%s src_cnt: %d len: %u flags: %lx\n" , +"%s src_cnt: %d len: %zu flags: %lx\n" , __func__, src_cnt, len, flags);if (dmaf_p_disabled_continue (flags))
@@ -693,7 +693,7 @@ iop_adma_prep_dma_pq_val(struct dma_chan *chan, dma_addr_t *pq, dma_addr_t *src,return NULL ;BUG_ON (len >IOP_ADMA_XOR_MAX_BYTE_COUNT ); -dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %u\n" , +dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %zu\n" , __func__, src_cnt, len);spin_lock_bh (&iop_chan->lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/99 net: lpc-enet: fix printk format strings
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit de6f97b2bace0e2eb6c3a86e124d1e652a587b56 ]
compile-testing this driver on other architectures showed multiple warnings:
drivers/net/ethernet/nxp/lpc_eth.c: In function 'lpc_eth_drv_probe':
drivers/net/ethernet/nxp/lpc_eth.c:1337:19: warning: format '%d' expects argument of type 'int', but argument 4 has type 'resource_size_t {aka long long unsigned int}' [-Wformat=]
drivers/net/ethernet/nxp/lpc_eth.c:1342:19: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=]
Use format strings that work on all architectures.
--- drivers/net/ethernet/nxp/lpc_eth.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/nxp/lpc_eth.c +7 -6
@@ -1417,13 +1417,14 @@ static int lpc_eth_drv_probe(struct platform_device *pdev) pldat->dma_buff_base_p = dma_handle;netdev_dbg (ndev,"IO address space :%pR\n" , res); -netdev_dbg (ndev,"IO address size :%d\n" ,resource_size (res)); +netdev_dbg (ndev,"IO address size :%zd\n" , + (size_t )resource_size (res));netdev_dbg (ndev,"IO address (mapped) :0x%p\n" , pldat->net_base);netdev_dbg (ndev,"IRQ number :%d\n" , ndev->irq); -netdev_dbg (ndev,"DMA buffer size :%d\n" , pldat->dma_buff_size); -netdev_dbg (ndev,"DMA buffer P address :0x%08x\n" , - pldat->dma_buff_base_p); +netdev_dbg (ndev,"DMA buffer size :%zd\n" , pldat->dma_buff_size); +netdev_dbg (ndev,"DMA buffer P address :%pad\n" , + &pldat->dma_buff_base_p);netdev_dbg (ndev,"DMA buffer V address :0x%p\n" , pldat->dma_buff_base_v);
@@ -1470,8 +1471,8 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)if (ret) goto err_out_unregister_netdev; -netdev_info (ndev,"LPC mac at 0x%08x irq %d\n" , - res->start, ndev->irq); +netdev_info (ndev,"LPC mac at 0x%08lx irq %d\n" , + (unsigned long )res->start, ndev->irq); phydev = pldat->phy_dev;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/99 media: radio/si470x: kill urb on error
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 0d616f2a3fdbf1304db44d451d9f07008556923b ]
In the probe() function radio->int_in_urb was not killed if an error occurred in the probe sequence. It was also missing in the disconnect.
This caused this syzbot issue:
https://syzkaller.appspot.com/bug?extid=2d4fc2a0c45ad8da7e99
--- drivers/media/radio/si470x/radio-si470x-usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/media/radio/si470x/radio-si470x-usb.c +4 -1
@@ -743,7 +743,7 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,/* start radio */ retval =si470x_start_usb (radio);if (retval <0 ) - goto err_all; + goto err_buf;/* set initial frequency */ si470x_set_freq (radio,87.5 *FREQ_MUL );/* available in all regions */
@@ -758,6 +758,8 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,return 0 ; err_all: +usb_kill_urb (radio->int_in_urb); +err_buf:kfree (radio->buffer); err_ctrl:v4l2_ctrl_handler_free (&radio->hdl);
@@ -831,6 +833,7 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf)mutex_lock (&radio->lock);v4l2_device_disconnect (&radio->v4l2_dev);video_unregister_device (&radio->videodev); +usb_kill_urb (radio->int_in_urb);usb_set_intfdata (intf,NULL );mutex_unlock (&radio->lock);v4l2_device_put (&radio->v4l2_dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/99 media: hdpvr: add terminating 0 at end of string
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 8b8900b729e4f31f12ac1127bde137c775c327e6 ]
dev->usbc_buf was passed as argument for %s, but it was not safeguarded by a terminating 0.
This caused this syzbot issue:
https://syzkaller.appspot.com/bug?extid=79d18aac4bf1770dd050
--- drivers/media/usb/hdpvr/hdpvr-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/usb/hdpvr/hdpvr-core.c +1 -0
@@ -143,6 +143,7 @@ static int device_authorization(struct hdpvr_device *dev) dev->fw_ver = dev->usbc_buf[1 ]; + dev->usbc_buf[46 ] ='\0' ;v4l2_info (&dev->v4l2_dev,"firmware version 0x%x dated %s\n" , dev->fw_ver, &dev->usbc_buf[2 ]);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/99 media: saa7146: add cleanup in hexium_attach()
In reply to Greg Kroah-HartmanFrom: Wenwen Wang <[email protected]>
[ Upstream commit 42e64117d3b4a759013f77bbcf25ab6700e55de7 ]
If saa7146_register_device() fails, no cleanup is executed, leading to memory/resource leaks. To fix this issue, perform necessary cleanup work before returning the error.
--- drivers/media/pci/saa7146/hexium_gemini.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/pci/saa7146/hexium_gemini.c +3 -0
@@ -304,6 +304,9 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d ret =saa7146_register_device (&hexium->video_dev, dev,"hexium gemini" ,VFL_TYPE_GRABBER );if (ret <0 ) {pr_err ("cannot register capture v4l2 device. skipping.\n" ); +saa7146_vv_release (dev); +i2c_del_adapter (&hexium->i2c_adapter); +kfree (hexium);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/99 ALSA: hda - Show the fatal CORB/RIRB error more clearly
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit dd65f7e19c6961ba6a69f7c925021b7a270cb950 ]
The last fallback of CORB/RIRB communication error recovery is to turn on the single command mode, and this last resort usually means that something is really screwed up. Instead of a normal dev_err(), show the error more clearly with dev_WARN() with the caller stack trace.
Also, show the bus-reset fallback also as an error, too.
--- sound/pci/hda/hda_controller.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/pci/hda/hda_controller.c +4 -1
@@ -667,10 +667,13 @@ static int azx_rirb_get_response(struct hdac_bus *bus, unsigned int addr,*/ if (hbus->allow_bus_reset && !hbus->response_reset && !hbus->in_reset) { hbus->response_reset =1 ; +dev_err (chip->card->dev, +"No response from codec, resetting bus: last cmd=0x%08x\n" , + bus->last_cmd[addr]);return -EAGAIN ;/* give a chance to retry */ } -dev_err (chip->card->dev, +dev_WARN (chip->card->dev,"azx_get_response timeout, switching to single_cmd mode: last cmd=0x%08x\n" , bus->last_cmd[addr]); chip->single_cmd =1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/99 media: ov9650: add a sanity check
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 093347abc7a4e0490e3c962ecbde2dc272a8f708 ]
As pointed by cppcheck:
[drivers/media/i2c/ov9650.c:706]: (error) Shifting by a negative value is undefined behaviour [drivers/media/i2c/ov9650.c:707]: (error) Shifting by a negative value is undefined behaviour [drivers/media/i2c/ov9650.c:721]: (error) Shifting by a negative value is undefined behaviour
Prevent mangling with gains with invalid values.
As pointed by Sylvester, this should never happen in practice, as min value of V4L2_CID_GAIN control is 16 (gain is always >= 16 and m is always >= 0), but it is too hard for a static analyzer to get this, as the logic with validates control min/max is elsewhere inside V4L2 core.
--- drivers/media/i2c/ov9650.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/i2c/ov9650.c +5 -0
@@ -707,6 +707,11 @@ static int ov965x_set_gain(struct ov965x *ov965x, int auto_gain)for (m =6 ; m >=0 ; m--)if (gain >= (1 << m) *16 )break ; + +/* Sanity check: don't adjust the gain with a negative value */ +if (m <0 ) +return -EINVAL ; + rgain = (gain - ((1 << m) *16 )) / (1 << m); rgain |= (((1 << m) -1 ) <<4 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/99 ACPI / CPPC: do not require the _PSD method
In reply to Greg Kroah-HartmanFrom: Al Stone <[email protected]>
[ Upstream commit 4c4cdc4c63853fee48c02e25c8605fb65a6c9924 ]
According to the ACPI 6.3 specification, the _PSD method is optional when using CPPC. The underlying assumption is that each CPU can change frequency independently from all other CPUs; _PSD is provided to tell the OS that some processors can NOT do that.
However, the acpi_get_psd() function returns ENODEV if there is no _PSD method present, or an ACPI error status if an error occurs when evaluating _PSD, if present. This makes _PSD mandatory when using CPPC, in violation of the specification, and only on Linux.
This has forced some firmware writers to provide a dummy _PSD, even though it is irrelevant, but only because Linux requires it; other OSPMs follow the spec. We really do not want to have OS specific ACPI tables, though.
So, correct acpi_get_psd() so that it does not return an error if there is no _PSD method present, but does return a failure when the method can not be executed properly. This allows _PSD to be optional as it should be.
--- drivers/acpi/cppc_acpi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/acpi/cppc_acpi.c +4 -2
@@ -137,8 +137,10 @@ static int acpi_get_psd(struct cpc_desc *cpc_ptr, acpi_handle handle)union acpi_object *psd =NULL ;struct acpi_psd_package *pdomain; - status =acpi_evaluate_object_typed (handle,"_PSD" ,NULL , &buffer, -ACPI_TYPE_PACKAGE ); + status =acpi_evaluate_object_typed (handle,"_PSD" ,NULL , + &buffer,ACPI_TYPE_PACKAGE ); +if (status ==AE_NOT_FOUND )/* _PSD is optional */ +return 0 ;if (ACPI_FAILURE (status))return -ENODEV ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/99 libtraceevent: Change users plugin directory
In reply to Greg Kroah-HartmanFrom: Tzvetomir Stoyanov <[email protected]>
[ Upstream commit e97fd1383cd77c467d2aed7fa4e596789df83977 ]
To be compliant with XDG user directory layout, the user's plugin directory is changed from ~/.traceevent/plugins to ~/.local/lib/traceevent/plugins/
--- tools/lib/traceevent/Makefile | 6 +++--- tools/lib/traceevent/event-plugin.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/lib/traceevent/Makefile +3 -3
@@ -54,15 +54,15 @@ set_plugin_dir := 1 # Set plugin_dir to preffered global plugin location # If we install under $HOME directory we go under -# $(HOME)/.traceevent/plugins +# $(HOME)/.local/lib/traceevent/plugins # # We dont set PLUGIN_DIR in case we install under $HOME # directory, because by default the code looks under: -# $(HOME)/.traceevent/plugins by default. +# $(HOME)/.local/lib/traceevent/plugins by default. # ifeq ($(plugin_dir),) ifeq ($(prefix),$(HOME)) -override plugin_dir = $(HOME)/.traceevent/plugins +override plugin_dir = $(HOME)/.local/lib/traceevent/plugins set_plugin_dir := 0 else override plugin_dir = $(libdir)/traceevent/plugins
tools/lib/traceevent/event-plugin.c +1 -1
@@ -30,7 +30,7 @@#include "event-parse.h" #include "event-utils.h" -#define LOCAL_PLUGIN_DIR ".traceevent/plugins" +#define LOCAL_PLUGIN_DIR ".local/lib/traceevent/plugins/" static struct registered_plugin_options { struct registered_plugin_options *next;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/99 hwmon: (acpi_power_meter) Change log level for unsafe software power cap
In reply to Greg Kroah-HartmanFrom: Wang Shenran <[email protected]>
[ Upstream commit 6e4d91aa071810deac2cd052161aefb376ecf04e ]
At boot time, the acpi_power_meter driver logs the following error level
message: "Ignoring unsafe software power cap". Having read about it from a few sources, it seems that the error message can be quite misleading.
While the message can imply that Linux is ignoring the fact that the system is operating in potentially dangerous conditions, the truth is the driver found an ACPI_PMC object that supports software power capping. The driver simply decides not to use it, perhaps because it doesn't support the object.
The best solution is probably changing the log level from error to warning. All sources I have found, regarding the error, have downplayed its significance. There is not much of a reason for it to be on error level, while causing potential confusions or misinterpretations.
--- drivers/hwmon/acpi_power_meter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/acpi_power_meter.c +2 -2
@@ -693,8 +693,8 @@ static int setup_attrs(struct acpi_power_meter_resource *resource)if (resource->caps.flags &POWER_METER_CAN_CAP ) {if (!can_cap_in_hardware ()) { -dev_err (&resource->acpi_dev->dev, -"Ignoring unsafe software power cap!\n" ); +dev_warn (&resource->acpi_dev->dev, +"Ignoring unsafe software power cap!\n" ); goto skip_unsafe_cap; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/99 ACPI: custom_method: fix memory leaks
In reply to Greg Kroah-HartmanFrom: Wenwen Wang <[email protected]>
[ Upstream commit 03d1571d9513369c17e6848476763ebbd10ec2cb ]
In cm_write(), 'buf' is allocated through kzalloc(). In the following execution, if an error occurs, 'buf' is not deallocated, leading to memory leaks. To fix this issue, free 'buf' before returning the error.
--- drivers/acpi/custom_method.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/acpi/custom_method.c +4 -1
@@ -48,8 +48,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,if ((*ppos > max_size) || (*ppos + count > max_size) || (*ppos + count < count) || - (count > uncopied_bytes)) + (count > uncopied_bytes)) { +kfree (buf);return -EINVAL ; + }if (copy_from_user (buf + (*ppos), user_buf, count)) {kfree (buf);
@@ -69,6 +71,7 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,add_taint (TAINT_OVERRIDDEN_ACPI_TABLE ,LOCKDEP_NOW_UNRELIABLE ); } +kfree (buf);return count; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/99 dmaengine: ti: edma: Do not reset reserved paRAM slots
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit c5dbe60664b3660f5ac5854e21273ea2e7ff698f ]
Skip resetting paRAM slots marked as reserved as they might be used by other cores.
--- drivers/dma/edma.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/dma/edma.c +6 -3
@@ -2218,9 +2218,6 @@ static int edma_probe(struct platform_device *pdev) ecc->default_queue = info->default_queue; -for (i =0 ; i < ecc->num_slots; i++) -edma_write_slot (ecc, i, &dummy_paramset); -if (info->rsv) {/* Set the reserved slots in inuse list */ rsv_slots = info->rsv->rsv_slots;
@@ -2233,6 +2230,12 @@ static int edma_probe(struct platform_device *pdev) } } +for (i =0 ; i < ecc->num_slots; i++) { +/* Reset only unused - not reserved - paRAM slots */ +if (!test_bit (i, ecc->slot_inuse)) +edma_write_slot (ecc, i, &dummy_paramset); + } +/* Clear the xbar mapped channels in unused list */ xbar_chans = info->xbar_chans;if (xbar_chans) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/99 kprobes: Prohibit probing on BUG() and WARN() address
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit e336b4027775cb458dc713745e526fa1a1996b2a ]
Since BUG() and WARN() may use a trap (e.g. UD2 on x86) to get the address where the BUG() has occurred, kprobes can not do single-step out-of-line that instruction. So prohibit probing on such address.
Without this fix, if someone put a kprobe on WARN(), the kernel will crash with invalid opcode error instead of outputing warning message, because kernel can not find correct bug address.
--- include/linux/bug.h | 5 +++++ kernel/kprobes.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
include/linux/bug.h +5 -0
@@ -102,6 +102,11 @@ int is_valid_bugaddr(unsigned long addr);#else /* !CONFIG_GENERIC_BUG */ +static inline void *find_bug (unsigned long bugaddr) +{ +return NULL ; +} +static inline enum bug_trap_type report_bug (unsigned long bug_addr,struct pt_regs *regs) {
kernel/kprobes.c +2 -1
@@ -1454,7 +1454,8 @@ static int check_kprobe_address_safe(struct kprobe *p,/* Ensure it is not in reserved area nor out of text */ if (!kernel_text_address ((unsigned long ) p->addr) ||within_kprobe_blacklist ((unsigned long ) p->addr) || -jump_label_text_reserved (p->addr, p->addr)) { +jump_label_text_reserved (p->addr, p->addr) || +find_bug ((unsigned long )p->addr)) { ret = -EINVAL ; goto out; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/99 ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit 2ec42f3147e1610716f184b02e65d7f493eed925 ]
Some tools use the snd_pcm_info_get_name() to try to identify PCMs or for other purposes.
Currently it is left empty with the dmaengine-pcm, in this case copy the pcm->id string as pcm->name.
For example IGT is using this to find the HDMI PCM for testing audio on it.
--- sound/soc/soc-generic-dmaengine-pcm.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/soc-generic-dmaengine-pcm.c +6 -0
@@ -301,6 +301,12 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)if (!dmaengine_pcm_can_report_residue (dev, pcm->chan[i])) pcm->flags |=SND_DMAENGINE_PCM_FLAG_NO_RESIDUE ; + +if (rtd->pcm->streams[i].pcm->name[0 ] =='\0' ) { +strncpy (rtd->pcm->streams[i].pcm->name, + rtd->pcm->streams[i].pcm->id, +sizeof (rtd->pcm->streams[i].pcm->name)); + } }return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/99 mmc: sdhci: Fix incorrect switch to HS mode
In reply to Greg Kroah-HartmanFrom: Al Cooper <[email protected]>
[ Upstream commit c894e33ddc1910e14d6f2a2016f60ab613fd8b37 ]
When switching from any MMC speed mode that requires 1.8v (HS200, HS400 and HS400ES) to High Speed (HS) mode, the system ends up configured for SDR12 with a 50MHz clock which is an illegal mode.
This happens because the SDHCI_CTRL_VDD_180 bit in the SDHCI_HOST_CONTROL2 register is left set and when this bit is set, the speed mode is controlled by the SDHCI_CTRL_UHS field in the SDHCI_HOST_CONTROL2 register. The SDHCI_CTRL_UHS field will end up being set to 0 (SDR12) by sdhci_set_uhs_signaling() because there is no UHS mode being set.
The fix is to change sdhci_set_uhs_signaling() to set the SDHCI_CTRL_UHS field to SDR25 (which is the same as HS) for any switch to HS mode.
This was found on a new eMMC controller that does strict checking of the speed mode and the corresponding clock rate. It caused the switch to HS400 mode to fail because part of the sequence to switch to HS400 requires a switch from HS200 to HS before going to HS400.
--- drivers/mmc/host/sdhci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci.c +3 -1
@@ -1452,7 +1452,9 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing) ctrl_2 |=SDHCI_CTRL_UHS_SDR104 ; else if (timing == MMC_TIMING_UHS_SDR12) ctrl_2 |= SDHCI_CTRL_UHS_SDR12; - else if (timing == MMC_TIMING_UHS_SDR25) + else if (timing == MMC_TIMING_SD_HS || + timing == MMC_TIMING_MMC_HS || + timing == MMC_TIMING_UHS_SDR25) ctrl_2 |= SDHCI_CTRL_UHS_SDR25; else if (timing == MMC_TIMING_UHS_SDR50) ctrl_2 |= SDHCI_CTRL_UHS_SDR50;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/99 ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 2127c01b7f63b06a21559f56a8c81a3c6535bd1a ]
In build_adc_controls(), there is an if statement on line 773 to check whether ak->adc_info is NULL:
if (! ak->adc_info ||
! ak->adc_info[mixer_ch].switch_name)When ak->adc_info is NULL, it is used on line 792:
knew.name = ak->adc_info[mixer_ch].selector_name;
Thus, a possible null-pointer dereference may occur.
To fix this bug, referring to lines 773 and 774, ak->adc_info and ak->adc_info[mixer_ch].selector_name are checked before being used.
This bug is found by a static analysis tool STCheck written by us.
--- sound/i2c/other/ak4xxx-adda.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/i2c/other/ak4xxx-adda.c +4 -3
@@ -789,11 +789,12 @@ static int build_adc_controls(struct snd_akm4xxx *ak)return err;memset (&knew,0 ,sizeof (knew)); - knew.name = ak->adc_info[mixer_ch].selector_name; -if (!knew.name) { +if (!ak->adc_info || + !ak->adc_info[mixer_ch].selector_name) { knew.name ="Capture Channel" ; knew.index = mixer_ch + ak->idx_offset *2 ; - } + }else + knew.name = ak->adc_info[mixer_ch].selector_name; knew.iface =SNDRV_CTL_ELEM_IFACE_MIXER ; knew.info = ak4xxx_capture_source_info;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/99 libertas: Add missing sentinel at end of if_usb.c fw_table
In reply to Greg Kroah-HartmanFrom: Kevin Easton <[email protected]>
[ Upstream commit 764f3f1ecffc434096e0a2b02f1a6cc964a89df6 ]
This sentinel tells the firmware loading process when to stop.
--- drivers/net/wireless/libertas/if_usb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/libertas/if_usb.c +2 -1
@@ -49,7 +49,8 @@ static const struct lbs_fw_table fw_table[] = { { MODEL_8388, "libertas/usb8388_v5.bin", NULL }, { MODEL_8388, "libertas/usb8388.bin", NULL }, { MODEL_8388, "usb8388.bin", NULL }, - { MODEL_8682, "libertas/usb8682.bin", NULL } + { MODEL_8682, "libertas/usb8682.bin", NULL }, + { 0, NULL, NULL } }; static struct usb_device_id if_usb_table[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/99 media: ttusb-dec: Fix info-leak in ttusb_dec_send_command()
In reply to Greg Kroah-HartmanFrom: Tomas Bortoli <[email protected]>
[ Upstream commit a10feaf8c464c3f9cfdd3a8a7ce17e1c0d498da1 ]
The function at issue does not always initialize each byte allocated for 'b' and can therefore leak uninitialized memory to a USB device in the call to usb_bulk_msg()
Use kzalloc() instead of kmalloc()
--- drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/ttusb-dec/ttusb_dec.c +1 -1
@@ -272,7 +272,7 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command,dprintk ("%s\n" , __func__); - b =kmalloc (COMMAND_PACKET_SIZE +4 ,GFP_KERNEL ); + b =kzalloc (COMMAND_PACKET_SIZE +4 ,GFP_KERNEL );if (!b)return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/99 btrfs: extent-tree: Make sure we only allocate extents from block groups with the same type
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
[ Upstream commit 2a28468e525f3924efed7f29f2bc5a2926e7e19a ]
[BUG]
With fuzzed image and MIXED_GROUPS super flag, we can hit the following BUG_ON():
kernel BUG at fs/btrfs/delayed-ref.c:491!
invalid opcode: 0000 [#1] PREEMPT SMP NOPTI
CPU: 0 PID: 1849 Comm: sync Tainted: G O 5.2.0-custom #27 RIP: 0010:update_existing_head_ref.cold+0x44/0x46 [btrfs] Call Trace: add_delayed_ref_head+0x20c/0x2d0 [btrfs] btrfs_add_delayed_tree_ref+0x1fc/0x490 [btrfs] btrfs_free_tree_block+0x123/0x380 [btrfs] __btrfs_cow_block+0x435/0x500 [btrfs] btrfs_cow_block+0x110/0x240 [btrfs] btrfs_search_slot+0x230/0xa00 [btrfs] ? __lock_acquire+0x105e/0x1e20 btrfs_insert_empty_items+0x67/0xc0 [btrfs] alloc_reserved_file_extent+0x9e/0x340 [btrfs] __btrfs_run_delayed_refs+0x78e/0x1240 [btrfs] ? kvm_clock_read+0x18/0x30 ? __sched_clock_gtod_offset+0x21/0x50 btrfs_run_delayed_refs.part.0+0x4e/0x180 [btrfs] btrfs_run_delayed_refs+0x23/0x30 [btrfs] btrfs_commit_transaction+0x53/0x9f0 [btrfs] btrfs_sync_fs+0x7c/0x1c0 [btrfs] ? __ia32_sys_fdatasync+0x20/0x20 sync_fs_one_sb+0x23/0x30 iterate_supers+0x95/0x100 ksys_sync+0x62/0xb0 __ia32_sys_sync+0xe/0x20 do_syscall_64+0x65/0x240 entry_SYSCALL_64_after_hwframe+0x49/0xbe
[CAUSE]
This situation is caused by several factors:
- Fuzzed image
The extent tree of this fs missed one backref for extent tree root. So we can allocated space from that slot.
- MIXED_BG feature
Super block has MIXED_BG flag.
- No mixed block groups exists
All block groups are just regular ones.
This makes data space_info->block_groups[] contains metadata block groups. And when we reserve space for data, we can use space in metadata block group.
Then we hit the following file operations:
- fallocate
We need to allocate data extents.
find_free_extent() choose to use the metadata block to allocate space from, and choose the space of extent tree root, since its backref is missing.
This generate one delayed ref head with is_data = 1.
- extent tree update
We need to update extent tree at run_delayed_ref time.
This generate one delayed ref head with is_data = 0, for the same bytenr of old extent tree root.
Then we trigger the BUG_ON().
[FIX]
The quick fix here is to check block_group->flags before using it.
The problem can only happen for MIXED_GROUPS fs. Regular filesystems won't have space_info with DATA|METADATA flag, and no way to hit the bug.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203255
--- fs/btrfs/extent-tree.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/btrfs/extent-tree.c +8 -0
@@ -7168,6 +7168,14 @@ static noinline int find_free_extent(struct btrfs_root *orig_root,*/ if ((flags & extra) && !(block_group->flags & extra)) goto loop; + +/* +* This block group has different flags than we want. +* It's possible that we have MIXED_GROUP flag but no +* block group is mixed. Just skip such block group. +*/ +btrfs_release_block_group (block_group, delalloc); +continue ; } have_block_group:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/99 ALSA: hda/realtek - Blacklist PC beep for Lenovo ThinkCentre M73/93
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 051c78af14fcd74a22b5af45548ad9d588247cc7 ]
Lenovo ThinkCentre M73 and M93 don't seem to have a proper beep although the driver tries to probe and set up blindly. Blacklist these machines for suppressing the beep creation.
--- sound/pci/hda/patch_realtek.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/patch_realtek.c +3 -0
@@ -977,6 +977,9 @@ static const struct snd_pci_quirk beep_white_list[] = {SND_PCI_QUIRK (0x1043 ,0x834a ,"EeePC" ,1 ),SND_PCI_QUIRK (0x1458 ,0xa002 ,"GA-MA790X" ,1 ),SND_PCI_QUIRK (0x8086 ,0xd613 ,"Intel" ,1 ), +/* blacklist -- no beep available */ +SND_PCI_QUIRK (0x17aa ,0x309e ,"Lenovo ThinkCentre M73" ,0 ), + SND_PCI_QUIRK(0x17aa, 0x30a3, "Lenovo ThinkCentre M93", 0), {} };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/99 media: omap3isp: Set device on omap3isp subdevs
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
[ Upstream commit e9eb103f027725053a4b02f93d7f2858b56747ce ]
The omap3isp driver registered subdevs without the dev field being set. Do that now.
--- drivers/media/platform/omap3isp/ispccdc.c | 1 + drivers/media/platform/omap3isp/ispccp2.c | 1 + drivers/media/platform/omap3isp/ispcsi2.c | 1 + drivers/media/platform/omap3isp/isppreview.c | 1 + drivers/media/platform/omap3isp/ispresizer.c | 1 + drivers/media/platform/omap3isp/ispstat.c | 2 ++ 6 files changed, 7 insertions(+)
drivers/media/platform/omap3isp/ispccdc.c +1 -0
@@ -2603,6 +2603,7 @@ int omap3isp_ccdc_register_entities(struct isp_ccdc_device *ccdc,int ret;/* Register the subdev and video node. */ + ccdc->subdev.dev = vdev->mdev->dev; ret =v4l2_device_register_subdev (vdev, &ccdc->subdev);if (ret <0 ) goto error;
drivers/media/platform/omap3isp/ispccp2.c +1 -0
@@ -1025,6 +1025,7 @@ int omap3isp_ccp2_register_entities(struct isp_ccp2_device *ccp2,int ret;/* Register the subdev and video nodes. */ + ccp2->subdev.dev = vdev->mdev->dev; ret =v4l2_device_register_subdev (vdev, &ccp2->subdev);if (ret <0 ) goto error;
drivers/media/platform/omap3isp/ispcsi2.c +1 -0
@@ -1201,6 +1201,7 @@ int omap3isp_csi2_register_entities(struct isp_csi2_device *csi2,int ret;/* Register the subdev and video nodes. */ + csi2->subdev.dev = vdev->mdev->dev; ret =v4l2_device_register_subdev (vdev, &csi2->subdev);if (ret <0 ) goto error;
drivers/media/platform/omap3isp/isppreview.c +1 -0
@@ -2223,6 +2223,7 @@ int omap3isp_preview_register_entities(struct isp_prev_device *prev,int ret;/* Register the subdev and video nodes. */ + prev->subdev.dev = vdev->mdev->dev; ret =v4l2_device_register_subdev (vdev, &prev->subdev);if (ret <0 ) goto error;
drivers/media/platform/omap3isp/ispresizer.c +1 -0
@@ -1679,6 +1679,7 @@ int omap3isp_resizer_register_entities(struct isp_res_device *res,int ret;/* Register the subdev and video nodes. */ + res->subdev.dev = vdev->mdev->dev; ret =v4l2_device_register_subdev (vdev, &res->subdev);if (ret <0 ) goto error;
drivers/media/platform/omap3isp/ispstat.c +2 -0
@@ -1010,6 +1010,8 @@ void omap3isp_stat_unregister_entities(struct ispstat *stat)int omap3isp_stat_register_entities (struct ispstat *stat,struct v4l2_device *vdev) { + stat->subdev.dev = vdev->mdev->dev; +return v4l2_device_register_subdev (vdev, &stat->subdev); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/99 printk: Do not lose last line in kmsg buffer dump
In reply to Greg Kroah-HartmanFrom: Vincent Whitchurch <[email protected]>
[ Upstream commit b46eff55ad5bd98e746c0a7022fe7ee071de5fee ]
kmsg_dump_get_buffer() is supposed to select all the youngest log messages which fit into the provided buffer. It determines the correct start index by using msg_print_text() with a NULL buffer to calculate the size of each entry. However, when performing the actual writes, msg_print_text() only writes the entry to the buffer if the written len is lesser than the size of the buffer. So if the lengths of the selected youngest log messages happen to precisely fill up the provided buffer, the last log message is not included.
We don't want to modify msg_print_text() to fill up the buffer and start returning a length which is equal to the size of the buffer, since callers of its other users, such as kmsg_dump_get_line(), depend upon the current behaviour.
Instead, fix kmsg_dump_get_buffer() to compensate for this.
For example, with the following two final prints:
[ 6.427502] AAAAAAAAAAAAA [ 6.427769] BBBBBBBB12345
A dump of a 64-byte buffer filled by kmsg_dump_get_buffer(), before this patch:
00000000: 3c 30 3e 5b 20 20 20 20 36 2e 35 32 32 31 39 37 <0>[ 6.522197 00000010: 5d 20 41 41 41 41 41 41 41 41 41 41 41 41 41 0a ] AAAAAAAAAAAAA. 00000020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00000030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
After this patch:
00000000: 3c 30 3e 5b 20 20 20 20 36 2e 34 35 36 36 37 38 <0>[ 6.456678 00000010: 5d 20 42 42 42 42 42 42 42 42 31 32 33 34 35 0a ] BBBBBBBB12345. 00000020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00000030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
--- kernel/printk/printk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/printk/printk.c +1 -1
@@ -3048,7 +3048,7 @@ bool kmsg_dump_get_buffer(struct kmsg_du seq = dumper->cur_seq; idx = dumper->cur_idx; prev =0 ; -while (l > size && seq < dumper->next_seq) { +while (l >= size && seq < dumper->next_seq) {struct printk_log *msg =log_from_idx (idx); l -=msg_print_text (msg, prev, true,NULL ,0 );
Greg Kroah-Hartman
maintainerPATCH 76/99 ALSA: firewire-tascam: handle error code when getting current source of clock
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
commit 2617120f4de6d0423384e0e86b14c78b9de84d5a upstream.
The return value of snd_tscm_stream_get_clock() is ignored. This commit checks the value and handle error.
--- sound/firewire/tascam/tascam-pcm.c | 3 +++ 1 file changed, 3 insertions(+)
sound/firewire/tascam/tascam-pcm.c +3 -0
@@ -81,6 +81,9 @@ static int pcm_open(struct snd_pcm_subst goto err_locked; err =snd_tscm_stream_get_clock (tscm, &clock); +if (err <0 ) + goto err_locked; +if (clock !=SND_TSCM_CLOCK_INTERNAL ||amdtp_stream_pcm_running (&tscm->rx_stream) ||amdtp_stream_pcm_running (&tscm->tx_stream)) {
Greg Kroah-Hartman
maintainerPATCH 80/99 parisc: Disable HP HSC-PCI Cards to prevent kernel crash
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 5fa1659105fac63e0f3c199b476025c2e04111ce upstream.
The HP Dino PCI controller chip can be used in two variants: as on-board controller (e.g. in B160L), or on an Add-On card ("Card-Mode") to bridge PCI components to systems without a PCI bus, e.g. to a HSC/GSC bus. One such Add-On card is the HP HSC-PCI Card which has one or more DEC Tulip PCI NIC chips connected to the on-card Dino PCI controller.
Dino in Card-Mode has a big disadvantage: All PCI memory accesses need to go through the DINO_MEM_DATA register, so Linux drivers will not be able to use the ioremap() function. Without ioremap() many drivers will not work, one example is the tulip driver which then simply crashes the kernel if it tries to access the ports on the HP HSC card.
This patch disables the HP HSC card if it finds one, and as such fixes the kernel crash on a HP D350/2 machine.
--- drivers/parisc/dino.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/parisc/dino.c +24 -0
@@ -160,6 +160,15 @@ struct dino_device (struct dino_device *)__pdata; }) +/* Check if PCI device is behind a Card-mode Dino. */ +static int pci_dev_is_behind_card_dino (struct pci_dev *dev) +{ +struct dino_device *dino_dev; + + dino_dev =DINO_DEV (parisc_walk_tree (dev->bus->bridge)); +return is_card_dino (&dino_dev->hba.dev->id); +} +/* * Dino Configuration Space Accessor Functions */
@@ -442,6 +451,21 @@ static void quirk_cirrus_cardbus(struct }DECLARE_PCI_FIXUP_ENABLE (PCI_VENDOR_ID_CIRRUS ,PCI_DEVICE_ID_CIRRUS_6832 , quirk_cirrus_cardbus ); +#ifdef CONFIG_TULIP +static void pci_fixup_tulip (struct pci_dev *dev) +{ +if (!pci_dev_is_behind_card_dino (dev)) +return ; +if (!(pci_resource_flags (dev,1 ) &IORESOURCE_MEM )) +return ; +pr_warn ("%s: HP HSC-PCI Cards with card-mode Dino not yet supported.\n" , +pci_name (dev)); +/* Disable this card by zeroing the PCI resources */ +memset (&dev->resource[0 ],0 ,sizeof (dev->resource[0 ])); +memset (&dev->resource[1 ],0 ,sizeof (dev->resource[1 ])); +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_DEC ,PCI_ANY_ID , pci_fixup_tulip); +#endif /* CONFIG_TULIP */ static void __init dino_bios_init (void )
Greg Kroah-Hartman
maintainerPATCH 81/99 KVM: x86: always stop emulation on page fault
In reply to Greg Kroah-HartmanFrom: Jan Dakinevich <[email protected]>
commit 8530a79c5a9f4e29e6ffb35ec1a79d81f4968ec8 upstream.
inject_emulated_exception() returns true if and only if nested page fault happens. However, page fault can come from guest page tables walk, either nested or not nested. In both cases we should stop an attempt to read under RIP and give guest to step over its own page fault handler.
This is also visible when an emulated instruction causes a #GP fault and the VMware backdoor is enabled. To handle the VMware backdoor, KVM intercepts #GP faults; with only the next patch applied, x86_emulate_instruction() injects a #GP but returns EMULATE_FAIL
instead of EMULATE_DONE. EMULATE_FAIL causes handle_exception_nmi()
(or gp_interception() for SVM) to re-inject the original #GP because it thinks emulation failed due to a non-VMware opcode. This patch prevents the issue as x86_emulate_instruction() will return EMULATE_DONE after injecting the #GP.
--- arch/x86/kvm/x86.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +3 -1
@@ -5486,8 +5486,10 @@ int x86_emulate_instruction(struct kvm_vif (reexecute_instruction (vcpu, cr2, write_fault_to_spt, emulation_type))return EMULATE_DONE ; -if (ctxt->have_exception &&inject_emulated_exception (vcpu)) +if (ctxt->have_exception) { +inject_emulated_exception (vcpu);return EMULATE_DONE ; + }if (emulation_type &EMULTYPE_SKIP )return EMULATE_FAIL ;return handle_emulation_failure (vcpu);
Greg Kroah-Hartman
maintainerPATCH 45/99 media: iguanair: add sanity checks
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
[ Upstream commit ab1cbdf159beba7395a13ab70bc71180929ca064 ]
The driver needs to check the endpoint types, too, as opposed to the number of endpoints. This also requires moving the check earlier.
--- drivers/media/rc/iguanair.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/media/rc/iguanair.c +7 -8
@@ -430,6 +430,10 @@ static int iguanair_probe(struct usb_interface *intf,int ret, pipein, pipeout;struct usb_host_interface *idesc; + idesc = intf->altsetting; +if (idesc->desc.bNumEndpoints <2 ) +return -ENODEV ; + ir =kzalloc (sizeof (*ir),GFP_KERNEL ); rc =rc_allocate_device ();if (!ir || !rc) {
@@ -444,18 +448,13 @@ static int iguanair_probe(struct usb_interface *intf, ir->urb_in =usb_alloc_urb (0 ,GFP_KERNEL ); ir->urb_out =usb_alloc_urb (0 ,GFP_KERNEL ); -if (!ir->buf_in || !ir->packet || !ir->urb_in || !ir->urb_out) { +if (!ir->buf_in || !ir->packet || !ir->urb_in || !ir->urb_out || + !usb_endpoint_is_int_in (&idesc->endpoint[0 ].desc) || + !usb_endpoint_is_int_out (&idesc->endpoint[1 ].desc)) { ret = -ENOMEM ; goto out; } - idesc = intf->altsetting; - -if (idesc->desc.bNumEndpoints <2 ) { - ret = -ENODEV ; - goto out; - } - ir->rc = rc; ir->dev = &intf->dev; ir->udev = udev;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/99 base: soc: Export soc_device_register/unregister APIs
In reply to Greg Kroah-HartmanFrom: Vinod Koul <[email protected]>
[ Upstream commit f7ccc7a397cf2ef64aebb2f726970b93203858d2 ]
Qcom Socinfo driver can be built as a module, so
export these two APIs.
--- drivers/base/soc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/base/soc.c +2 -0
@@ -146,6 +146,7 @@ struct soc_device *soc_device_register(struct soc_device_attribute *soc_dev_attr out1:return ERR_PTR (ret); } +EXPORT_SYMBOL_GPL (soc_device_register);/* Ensure soc_dev->attr is freed prior to calling soc_device_unregister. */ void soc_device_unregister (struct soc_device *soc_dev)
@@ -154,6 +155,7 @@ void soc_device_unregister(struct soc_device *soc_dev)device_unregister (&soc_dev->dev); } +EXPORT_SYMBOL_GPL (soc_device_unregister);static int __init soc_bus_register (void ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/99 ALSA: usb-audio: Skip bSynchAddress endpoint check if it is invalid
In reply to Greg Kroah-HartmanFrom: Ard van Breemen <[email protected]>
[ Upstream commit 1b34121d9f26d272b0b2334209af6b6fc82d4bf1 ]
The Linux kernel assumes that get_endpoint(alts,0) and get_endpoint(alts,1) are eachothers feedback endpoints.
To reassure that validity it will test bsynchaddress to comply with that assumption. But if the bsyncaddress is 0 (invalid), it will flag that as a wrong assumption and return an error.
Fix: Skip the test if bSynchAddress is 0.
Note: those with a valid bSynchAddress should have a code quirck added.
--- sound/usb/pcm.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/pcm.c +1 -0
@@ -460,6 +460,7 @@ static int set_sync_endpoint(struct snd_usb_substream *subs, } ep =get_endpoint (alts,1 )->bEndpointAddress;if (get_endpoint (alts,0 )->bLength >=USB_DT_ENDPOINT_AUDIO_SIZE && +get_endpoint (alts,0 )->bSynchAddress !=0 && ((is_playback && ep != (unsigned int )(get_endpoint (alts,0 )->bSynchAddress |USB_DIR_IN )) || (!is_playback && ep != (unsigned int )(get_endpoint (alts,0 )->bSynchAddress & ~USB_DIR_IN )))) { dev_err(&dev->dev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/99 md: dont call spare_active in md_reap_sync_thread if all member devices cant work
In reply to Greg Kroah-HartmanFrom: Guoqing Jiang <[email protected]>
[ Upstream commit 0d8ed0e9bf9643f27f4816dca61081784dedb38d ]
When add one disk to array, the md_reap_sync_thread is responsible to activate the spare and set In_sync flag for the new member in spare_active().
But if raid1 has one member disk A, and disk B is added to the array. Then we offline A before all the datas are synchronized from A to B, obviously B doesn't have the latest data as A, but B is still marked with In_sync flag.
So let's not call spare_active under the condition, otherwise B is still showed with 'U' state which is not correct.
--- drivers/md/md.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/md.c +2 -1
@@ -8445,7 +8445,8 @@ void md_reap_sync_thread(struct mddev *mddev)/* resync has finished, collect result */ md_unregister_thread (&mddev->sync_thread);if (!test_bit (MD_RECOVERY_INTR , &mddev->recovery) && - !test_bit (MD_RECOVERY_REQUESTED , &mddev->recovery)) { + !test_bit (MD_RECOVERY_REQUESTED , &mddev->recovery) && + mddev->degraded != mddev->raid_disks) {/* success...*/ /* activate any spares */ if (mddev->pers->spare_active (mddev)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/99 md: dont set In_sync if array is frozen
In reply to Greg Kroah-HartmanFrom: Guoqing Jiang <[email protected]>
[ Upstream commit 062f5b2ae12a153644c765e7ba3b0f825427be1d ]
When a disk is added to array, the following path is called in mdadm.
Manage_subdevs -> sysfs_freeze_array
-> Manage_add
-> sysfs_set_str(&info, NULL, "sync_action","idle")Then from kernel side, Manage_add invokes the path (add_new_disk -> validate_super = super_1_validate) to set In_sync flag.
Since In_sync means "device is in_sync with rest of array", and the new added disk need to resync thread to help the synchronization of data. And md_reap_sync_thread would call spare_active to set In_sync for the new added disk finally. So don't set In_sync if array is in frozen.
--- drivers/md/md.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/md/md.c +9 -2
@@ -1667,8 +1667,15 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev)if (!(le32_to_cpu (sb->feature_map) &MD_FEATURE_RECOVERY_BITMAP )) rdev->saved_raid_disk =-1 ; - }else -set_bit (In_sync, &rdev->flags); + }else { +/* +* If the array is FROZEN, then the device can't +* be in_sync with rest of array. +*/ +if (!test_bit (MD_RECOVERY_FROZEN , + &mddev->recovery)) +set_bit (In_sync, &rdev->flags); + } rdev->raid_disk = role;break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/99 x86/reboot: Always use NMI fallback when shutdown via reboot vector IPI fails
In reply to Greg Kroah-HartmanFrom: Grzegorz Halat <[email protected]>
[ Upstream commit 747d5a1bf293dcb33af755a6d285d41b8c1ea010 ]
A reboot request sends an IPI via the reboot vector and waits for all other CPUs to stop. If one or more CPUs are in critical regions with interrupts disabled then the IPI is not handled on those CPUs and the shutdown hangs if native_stop_other_cpus() is called with the wait argument set.
Such a situation can happen when one CPU was stopped within a lock held section and another CPU is trying to acquire that lock with interrupts disabled. There are other scenarios which can cause such a lockup as well.
In theory the shutdown should be attempted by an NMI IPI after the timeout period elapsed. Though the wait loop after sending the reboot vector IPI prevents this. It checks the wait request argument and the timeout. If wait is set, which is true for sys_reboot() then it won't fall through to the NMI shutdown method after the timeout period has finished.
This was an oversight when the NMI shutdown mechanism was added to handle the 'reboot IPI is not working' situation. The mechanism was added to deal with stuck panic shutdowns, which do not have the wait request set, so the 'wait request' case was probably not considered.
Remove the wait check from the post reboot vector IPI wait loop and enforce that the wait loop in the NMI fallback path is invoked even if NMI IPIs are disabled or the registration of the NMI handler fails. That second wait loop will then hang if not all CPUs shutdown and the wait argument is set.
[ tglx: Avoid the hard to parse line break in the NMI fallback path,
add comments and massage the changelog ]
--- arch/x86/kernel/smp.c | 46 +++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 19 deletions(-)
arch/x86/kernel/smp.c +27 -19
@@ -176,6 +176,12 @@ asmlinkage __visible void smp_reboot_interrupt(void)irq_exit (); } +static int register_stop_handler (void ) +{ +return register_nmi_handler (NMI_LOCAL , smp_stop_nmi_callback, +NMI_FLAG_FIRST ,"smp_stop" ); +} +static void native_stop_other_cpus (int wait) {unsigned long flags;
@@ -209,39 +215,41 @@ static void native_stop_other_cpus(int wait) apic->send_IPI_allbutself (REBOOT_VECTOR );/* -* Don't wait longer than a second if the caller -* didn't ask us to wait. +* Don't wait longer than a second for IPI completion. The +* wait request is not checked here because that would +* prevent an NMI shutdown attempt in case that not all +* CPUs reach shutdown state. */ timeout =USEC_PER_SEC ; -while (num_online_cpus () >1 && (wait || timeout--)) +while (num_online_cpus () >1 && timeout--)udelay (1 ); } - -/* if the REBOOT_VECTOR didn't work, try with the NMI */ -if ((num_online_cpus () >1 ) && (!smp_no_nmi_ipi)) { -if (register_nmi_handler (NMI_LOCAL , smp_stop_nmi_callback, -NMI_FLAG_FIRST ,"smp_stop" )) -/* Note: we ignore failures here */ -/* Hope the REBOOT_IRQ is good enough */ - goto finish; - -/* sync above data before sending IRQ */ -wmb (); -pr_emerg ("Shutting down cpus with NMI\n" ); +/* if the REBOOT_VECTOR didn't work, try with the NMI */ +if (num_online_cpus () >1 ) { +/* +* If NMI IPI is enabled, try to register the stop handler +* and send the IPI. In any case try to wait for the other +* CPUs to stop. +*/ +if (!smp_no_nmi_ipi && !register_stop_handler ()) { +/* Sync above data before sending IRQ */ +wmb (); - apic->send_IPI_allbutself (NMI_VECTOR ); +pr_emerg ("Shutting down cpus with NMI\n" ); + apic->send_IPI_allbutself (NMI_VECTOR ); + }/* -* Don't wait longer than a 10 ms if the caller -* didn't ask us to wait. +* Don't wait longer than 10 ms if the caller didn't +* reqeust it. If wait is true, the machine hangs here if +* one or more CPUs do not reach shutdown state. */ timeout =USEC_PER_MSEC *10 ;while (num_online_cpus () >1 && (wait || timeout--))udelay (1 ); } -finish:local_irq_save (flags);disable_local_APIC ();mcheck_cpu_clear (this_cpu_ptr (&cpu_info));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 83/99 KVM: x86: Manually calculate reserved bits when loading PDPTRS
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit 16cfacc8085782dab8e365979356ce1ca87fd6cc upstream.
Manually generate the PDPTR reserved bit mask when explicitly loading PDPTRs. The reserved bits that are being tracked by the MMU reflect the current paging mode, which is unlikely to be PAE paging in the vast majority of flows that use load_pdptrs(), e.g. CR0 and CR4 emulation, __set_sregs(), etc... This can cause KVM to incorrectly signal a bad PDPTR, or more likely, miss a reserved bit check and subsequently fail a VM-Enter due to a bad VMCS.GUEST_PDPTR.
Add a one off helper to generate the reserved bits instead of sharing code across the MMU's calculations and the PDPTR emulation. The PDPTR reserved bits are basically set in stone, and pushing a helper into the MMU's calculation adds unnecessary complexity without improving readability.
Oppurtunistically fix/update the comment for load_pdptrs().
Note, the buggy commit also introduced a deliberate functional change, "Also remove bit 5-6 from rsvd_bits_mask per latest SDM.", which was effectively (and correctly) reverted by commit cd9ae5fe47df ("KVM: x86:
Fix page-tables reserved bits"). A bit of SDM archaeology shows that the SDM from late 2008 had a bug (likely a copy+paste error) where it listed bits 6:5 as AVL and A for PDPTEs used for 4k entries but reserved for 2mb entries. I.e. the SDM contradicted itself, and bits 6:5 are and always have been reserved.
--- arch/x86/kvm/x86.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
arch/x86/kvm/x86.c +8 -3
@@ -523,8 +523,14 @@ static int kvm_read_nested_guest_page(st data, offset, len, access); } +static inline u64 pdptr_rsvd_bits (struct kvm_vcpu *vcpu) +{ +return rsvd_bits (cpuid_maxphyaddr (vcpu),63 ) |rsvd_bits (5 ,8 ) | +rsvd_bits (1 ,2 ); +} +/* -* Load the pae pdptrs. Return true is they are all valid. +* Load the pae pdptrs. Return 1 if they are all valid, 0 otherwise. */ int load_pdptrs (struct kvm_vcpu *vcpu,struct kvm_mmu *mmu,unsigned long cr3) {
@@ -543,8 +549,7 @@ int load_pdptrs(struct kvm_vcpu *vcpu, s }for (i =0 ; i <ARRAY_SIZE (pdpte); ++i) {if (is_present_gpte (pdpte[i]) && - (pdpte[i] & - vcpu->arch.mmu.guest_rsvd_check.rsvd_bits_mask[0 ][2 ])) { + (pdpte[i] &pdptr_rsvd_bits (vcpu))) { ret =0 ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 92/99 quota: fix wrong condition in is_quota_modification()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
commit 6565c182094f69e4ffdece337d395eb7ec760efc upstream.
Quoted from
commit 3da40c7b0898 ("ext4: only call ext4_truncate when size <= isize")
" At LSF we decided that if we truncate up from isize we shouldn't trim
fallocated blocks that were fallocated with KEEP_SIZE and are past the
new i_size. This patch fixes ext4 to do this. "
And generic/092 of fstest have covered this case for long time, however is_quota_modification() didn't adjust based on that rule, so that in below condition, we will lose to quota block change:
- fallocate blocks beyond EOF
- remount
- truncate(file_path, file_size)
Fix it.
--- include/linux/quotaops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/quotaops.h +1 -1
@@ -21,7 +21,7 @@ static inline struct quota_info *sb_dqop/* i_mutex must being held */ static inline bool is_quota_modification (struct inode *inode,struct iattr *ia) { -return (ia->ia_valid &ATTR_SIZE && ia->ia_size != inode->i_size) || +return (ia->ia_valid &ATTR_SIZE ) || (ia->ia_valid &ATTR_UID && !uid_eq (ia->ia_uid, inode->i_uid)) || (ia->ia_valid &ATTR_GID && !gid_eq (ia->ia_gid, inode->i_gid)); }
Greg Kroah-Hartman
maintainerPATCH 95/99 CIFS: Fix oplock handling for SMB 2.1+ protocols
In reply to Greg Kroah-HartmanFrom: Pavel Shilovsky <[email protected]>
commit a016e2794fc3a245a91946038dd8f34d65e53cc3 upstream.
There may be situations when a server negotiates SMB 2.1 protocol version or higher but responds to a CREATE request with an oplock rather than a lease.
Currently the client doesn't handle such a case correctly:
when another CREATE comes in the server sends an oplock break to the initial CREATE and the client doesn't send an ack back due to a wrong caching level being set (READ instead of RWH). Missing an oplock break ack makes the server wait until the break times out which dramatically increases the latency of the second CREATE.
Fix this by properly detecting oplocks when using SMB 2.1 protocol version and higher.
--- fs/cifs/smb2ops.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/cifs/smb2ops.c +5 -0
@@ -1335,6 +1335,11 @@ smb21_set_oplock_level(struct cifsInodeIif (oplock ==SMB2_OPLOCK_LEVEL_NOCHANGE )return ; +/* Check if the server granted an oplock rather than a lease */ +if (oplock &SMB2_OPLOCK_LEVEL_EXCLUSIVE ) +return smb2_set_oplock_level (cinode, oplock, epoch, + purge_cache); +if (oplock &SMB2_LEASE_READ_CACHING_HE ) { new_oplock |=CIFS_CACHE_READ_FLG ;strcat (message,"R" );
Greg Kroah-Hartman
maintainerPATCH 96/99 ovl: filter of trusted xattr results in audit
In reply to Greg Kroah-HartmanFrom: Mark Salyzyn <[email protected]>
commit 5c2e9f346b815841f9bed6029ebcb06415caf640 upstream.
When filtering xattr list for reading, presence of trusted xattr results in a security audit log. However, if there is other content no errno will be set, and if there isn't, the errno will be -ENODATA and not -EPERM as is usually associated with a lack of capability. The check does not block the request to list the xattrs present.
Switch to ns_capable_noaudit to reflect a more appropriate check.
--- fs/overlayfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/overlayfs/inode.c +2 -1
@@ -292,7 +292,8 @@ static bool ovl_can_list(const char *s)return true;/* Never list trusted.overlay, list other trusted for superuser only */ -return !ovl_is_private_xattr (s) &&capable (CAP_SYS_ADMIN ); +return !ovl_is_private_xattr (s) && +ns_capable_noaudit (&init_user_ns,CAP_SYS_ADMIN ); }ssize_t ovl_listxattr (struct dentry *dentry,char *list,size_t size)
Greg Kroah-Hartman
maintainerPATCH 97/99 Btrfs: fix use-after-free when using the tree modification log
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit efad8a853ad2057f96664328a0d327a05ce39c76 upstream.
At ctree.c:get_old_root(), we are accessing a root's header owner field after we have freed the respective extent buffer. This results in an use-after-free that can lead to crashes, and when CONFIG_DEBUG_PAGEALLOC is set, results in a stack trace like the following:
[ 3876.799331] stack segment: 0000 [#1] SMP DEBUG_PAGEALLOC PTI [ 3876.799363] CPU: 0 PID: 15436 Comm: pool Not tainted 5.3.0-rc3-btrfs-next-54 #1 [ 3876.799385] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-0-ga698c8995f-prebuilt.qemu.org 04/01/2014 [ 3876.799433] RIP: 0010:btrfs_search_old_slot+0x652/0xd80 [btrfs] (...) [ 3876.799502] RSP: 0018:ffff9f08c1a2f9f0 EFLAGS: 00010286 [ 3876.799518] RAX: ffff8dd300000000 RBX: ffff8dd85a7a9348 RCX: 000000038da26000 [ 3876.799538] RDX: 0000000000000000 RSI: ffffe522ce368980 RDI: 0000000000000246 [ 3876.799559] RBP: dae1922adadad000 R08: 0000000008020000 R09: ffffe522c0000000 [ 3876.799579] R10: ffff8dd57fd788c8 R11: 000000007511b030 R12: ffff8dd781ddc000 [ 3876.799599] R13: ffff8dd9e6240578 R14: ffff8dd6896f7a88 R15: ffff8dd688cf90b8 [ 3876.799620] FS: 00007f23ddd97700(0000) GS:ffff8dda20200000(0000) knlGS:0000000000000000 [ 3876.799643] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3876.799660] CR2: 00007f23d4024000 CR3: 0000000710bb0005 CR4: 00000000003606f0 [ 3876.799682] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 3876.799703] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 3876.799723] Call Trace: [ 3876.799735] ? do_raw_spin_unlock+0x49/0xc0 [ 3876.799749] ? _raw_spin_unlock+0x24/0x30 [ 3876.799779] resolve_indirect_refs+0x1eb/0xc80 [btrfs] [ 3876.799810] find_parent_nodes+0x38d/0x1180 [btrfs] [ 3876.799841] btrfs_check_shared+0x11a/0x1d0 [btrfs] [ 3876.799870] ? extent_fiemap+0x598/0x6e0 [btrfs] [ 3876.799895] extent_fiemap+0x598/0x6e0 [btrfs] [ 3876.799913] do_vfs_ioctl+0x45a/0x700 [ 3876.799926] ksys_ioctl+0x70/0x80 [ 3876.799938] ? trace_hardirqs_off_thunk+0x1a/0x20 [ 3876.799953] __x64_sys_ioctl+0x16/0x20 [ 3876.799965] do_syscall_64+0x62/0x220 [ 3876.799977] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 3876.799993] RIP: 0033:0x7f23e0013dd7 (...) [ 3876.800056] RSP: 002b:00007f23ddd96ca8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 3876.800078] RAX: ffffffffffffffda RBX: 00007f23d80210f8 RCX: 00007f23e0013dd7 [ 3876.800099] RDX: 00007f23d80210f8 RSI: 00000000c020660b RDI: 0000000000000003 [ 3876.800626] RBP: 000055fa2a2a2440 R08: 0000000000000000 R09: 00007f23ddd96d7c [ 3876.801143] R10: 00007f23d8022000 R11: 0000000000000246 R12: 00007f23ddd96d80 [ 3876.801662] R13: 00007f23ddd96d78 R14: 00007f23d80210f0 R15: 00007f23ddd96d80 (...) [ 3876.805107] ---[ end trace e53161e179ef04f9 ]---
Fix that by saving the root's header owner field into a local variable before freeing the root's extent buffer, and then use that local variable when needed.
--- fs/btrfs/ctree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/ctree.c +3 -1
@@ -1418,6 +1418,7 @@ get_old_root(struct btrfs_root *root, u6struct tree_mod_elem *tm;struct extent_buffer *eb =NULL ;struct extent_buffer *eb_root; +u64 eb_root_owner =0 ;struct extent_buffer *old;struct tree_mod_root *old_root =NULL ;u64 old_generation =0 ;
@@ -1451,6 +1452,7 @@ get_old_root(struct btrfs_root *root, u6free_extent_buffer (old); } }else if (old_root) { + eb_root_owner =btrfs_header_owner (eb_root);btrfs_tree_read_unlock (eb_root);free_extent_buffer (eb_root); eb =alloc_dummy_extent_buffer (root->fs_info, logical);
@@ -1468,7 +1470,7 @@ get_old_root(struct btrfs_root *root, u6if (old_root) {btrfs_set_header_bytenr (eb, eb->start);btrfs_set_header_backref_rev (eb,BTRFS_MIXED_BACKREF_REV ); -btrfs_set_header_owner (eb,btrfs_header_owner (eb_root)); +btrfs_set_header_owner (eb, eb_root_owner);btrfs_set_header_level (eb, old_root->level);btrfs_set_header_generation (eb, old_generation); }
Greg Kroah-Hartman
maintainerPATCH 98/99 btrfs: Relinquish CPUs in btrfs_compare_trees
In reply to Greg Kroah-HartmanFrom: Nikolay Borisov <[email protected]>
commit 6af112b11a4bc1b560f60a618ac9c1dcefe9836e upstream.
When doing any form of incremental send the parent and the child trees need to be compared via btrfs_compare_trees. This can result in long loop chains without ever relinquishing the CPU. This causes softlockup detector to trigger when comparing trees with a lot of items. Example report:
watchdog: BUG: soft lockup - CPU#0 stuck for 24s! [snapperd:16153] CPU: 0 PID: 16153 Comm: snapperd Not tainted 5.2.9-1-default #1 openSUSE Tumbleweed (unreleased) Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015 pstate: 40000005 (nZcv daif -PAN -UAO) pc : __ll_sc_arch_atomic_sub_return+0x14/0x20 lr : btrfs_release_extent_buffer_pages+0xe0/0x1e8 [btrfs] sp : ffff00001273b7e0 Call trace: __ll_sc_arch_atomic_sub_return+0x14/0x20 release_extent_buffer+0xdc/0x120 [btrfs] free_extent_buffer.part.0+0xb0/0x118 [btrfs] free_extent_buffer+0x24/0x30 [btrfs] btrfs_release_path+0x4c/0xa0 [btrfs] btrfs_free_path.part.0+0x20/0x40 [btrfs] btrfs_free_path+0x24/0x30 [btrfs] get_inode_info+0xa8/0xf8 [btrfs] finish_inode_if_needed+0xe0/0x6d8 [btrfs] changed_cb+0x9c/0x410 [btrfs] btrfs_compare_trees+0x284/0x648 [btrfs] send_subvol+0x33c/0x520 [btrfs] btrfs_ioctl_send+0x8a0/0xaf0 [btrfs] btrfs_ioctl+0x199c/0x2288 [btrfs] do_vfs_ioctl+0x4b0/0x820 ksys_ioctl+0x84/0xb8 __arm64_sys_ioctl+0x28/0x38 el0_svc_common.constprop.0+0x7c/0x188 el0_svc_handler+0x34/0x90 el0_svc+0x8/0xc
Fix this by adding a call to cond_resched at the beginning of the main loop in btrfs_compare_trees.
--- fs/btrfs/ctree.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/ctree.c +1 -0
@@ -5435,6 +5435,7 @@ int btrfs_compare_trees(struct btrfs_roo advance_left = advance_right =0 ;while (1 ) { +cond_resched ();if (advance_left && !left_end_reached) { ret = tree_advance(left_root, left_path, &left_level, left_root_level,
Greg Kroah-Hartman
maintainerPATCH 99/99 Btrfs: fix race setting up and completing qgroup rescan workers
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 13fc1d271a2e3ab8a02071e711add01fab9271f6 ]
There is a race between setting up a qgroup rescan worker and completing a qgroup rescan worker that can lead to callers of the qgroup rescan wait ioctl to either not wait for the rescan worker to complete or to hang forever due to missing wake ups. The following diagram shows a sequence of steps that illustrates the race.
CPU 1 CPU 2 CPU 3
btrfs_ioctl_quota_rescan()
btrfs_qgroup_rescan()
qgroup_rescan_init()
mutex_lock(&fs_info->qgroup_rescan_lock)
spin_lock(&fs_info->qgroup_lock)
fs_info->qgroup_flags |=
BTRFS_QGROUP_STATUS_FLAG_RESCAN
init_completion(
&fs_info->qgroup_rescan_completion)
fs_info->qgroup_rescan_running = true
mutex_unlock(&fs_info->qgroup_rescan_lock)
spin_unlock(&fs_info->qgroup_lock)
btrfs_init_work()
--> starts the worker
btrfs_qgroup_rescan_worker()
mutex_lock(&fs_info->qgroup_rescan_lock)
fs_info->qgroup_flags &=
~BTRFS_QGROUP_STATUS_FLAG_RESCAN
mutex_unlock(&fs_info->qgroup_rescan_lock)
starts transaction, updates qgroup status
item, etc
btrfs_ioctl_quota_rescan()
btrfs_qgroup_rescan()
qgroup_rescan_init()
mutex_lock(&fs_info->qgroup_rescan_lock)
spin_lock(&fs_info->qgroup_lock)
fs_info->qgroup_flags |=
BTRFS_QGROUP_STATUS_FLAG_RESCAN
init_completion(
&fs_info->qgroup_rescan_completion)
fs_info->qgroup_rescan_running = true
mutex_unlock(&fs_info->qgroup_rescan_lock)
spin_unlock(&fs_info->qgroup_lock)
btrfs_init_work()
--> starts another worker
mutex_lock(&fs_info->qgroup_rescan_lock)
fs_info->qgroup_rescan_running = false
mutex_unlock(&fs_info->qgroup_rescan_lock)
complete_all(&fs_info->qgroup_rescan_completion)Before the rescan worker started by the task at CPU 3 completes, if another task calls btrfs_ioctl_quota_rescan(), it will get -EINPROGRESS because the flag BTRFS_QGROUP_STATUS_FLAG_RESCAN is set at fs_info->qgroup_flags, which is expected and correct behaviour.
However if other task calls btrfs_ioctl_quota_rescan_wait() before the rescan worker started by the task at CPU 3 completes, it will return immediately without waiting for the new rescan worker to complete, because fs_info->qgroup_rescan_running is set to false by CPU 2.
This race is making test case btrfs/171 (from fstests) to fail often:
btrfs/171 9s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/171.out.bad)
# --- tests/btrfs/171.out 2018-09-16 21:30:48.505104287 +0100 # +++ /home/fdmanana/git/hub/xfstests/results//btrfs/171.out.bad 2019-09-19 02:01:36.938486039 +0100 # @@ -1,2 +1,3 @@
# QA output created by 171
# +ERROR: quota rescan failed: Operation now in progress
# Silence is golden
# ...
# (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/171.out /home/fdmanana/git/hub/xfstests/results//btrfs/171.out.bad' to see the entire diff)
That is because the test calls the btrfs-progs commands "qgroup quota rescan -w", "qgroup assign" and "qgroup remove" in a sequence that makes calls to the rescan start ioctl fail with -EINPROGRESS (note the "btrfs" commands 'qgroup assign' and 'qgroup remove' often call the rescan start ioctl after calling the qgroup assign ioctl, btrfs_ioctl_qgroup_assign()), since previous waits didn't actually wait for a rescan worker to complete.
Another problem the race can cause is missing wake ups for waiters, since the call to complete_all() happens outside a critical section and after clearing the flag BTRFS_QGROUP_STATUS_FLAG_RESCAN. In the sequence diagram above, if we have a waiter for the first rescan task (executed by CPU 2), then fs_info->qgroup_rescan_completion.wait is not empty, and if after the rescan worker clears BTRFS_QGROUP_STATUS_FLAG_RESCAN and before it calls complete_all() against fs_info->qgroup_rescan_completion, the task at CPU 3 calls init_completion() against fs_info->qgroup_rescan_completion which re-initilizes its wait queue to an empty queue, therefore causing the rescan worker at CPU 2 to call complete_all() against an empty queue, never waking up the task waiting for that rescan worker.
Fix this by clearing BTRFS_QGROUP_STATUS_FLAG_RESCAN and setting fs_info->qgroup_rescan_running to false in the same critical section, delimited by the mutex fs_info->qgroup_rescan_lock, as well as doing the call to complete_all() in that same critical section. This gives the protection needed to avoid rescan wait ioctl callers not waiting for a running rescan worker and the lost wake ups problem, since setting that rescan flag and boolean as well as initializing the wait queue is done already in a critical section delimited by that mutex (at qgroup_rescan_init()).
--- fs/btrfs/qgroup.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
fs/btrfs/qgroup.c +19 -14
@@ -2328,9 +2328,6 @@ out:btrfs_free_path (path);mutex_lock (&fs_info->qgroup_rescan_lock); -if (!btrfs_fs_closing (fs_info)) - fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN ; -if (err >0 && fs_info->qgroup_flags &BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ) { fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT ;
@@ -2346,16 +2343,30 @@ out: trans =btrfs_start_transaction (fs_info->quota_root,1 );if (IS_ERR (trans)) { err =PTR_ERR (trans); + trans =NULL ;btrfs_err (fs_info,"fail to start transaction for status update: %d\n" , err); - goto done; } - ret =update_qgroup_status_item (trans, fs_info, fs_info->quota_root); -if (ret <0 ) { - err = ret; -btrfs_err (fs_info,"fail to update qgroup status: %d\n" , err); + +mutex_lock (&fs_info->qgroup_rescan_lock); +if (!btrfs_fs_closing (fs_info)) + fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN ; +if (trans) { + ret =update_qgroup_status_item (trans, fs_info, fs_info->quota_root); +if (ret <0 ) { + err = ret; +btrfs_err (fs_info,"fail to update qgroup status: %d" , + err); + } } + fs_info->qgroup_rescan_running = false; +complete_all (&fs_info->qgroup_rescan_completion); +mutex_unlock (&fs_info->qgroup_rescan_lock); + +if (!trans) +return ; +btrfs_end_transaction (trans, fs_info->quota_root);if (btrfs_fs_closing (fs_info)) {
@@ -2366,12 +2377,6 @@ out: }else {btrfs_err (fs_info,"qgroup scan failed with %d" , err); } - -done: -mutex_lock (&fs_info->qgroup_rescan_lock); - fs_info->qgroup_rescan_running = false; -mutex_unlock (&fs_info->qgroup_rescan_lock); -complete_all (&fs_info->qgroup_rescan_completion); }/*
Greg Kroah-Hartman
maintainerPATCH 84/99 media: sn9c20x: Add MSI MS-1039 laptop to flip_dmi_table
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 7e0bb5828311f811309bed5749528ca04992af2f upstream.
Like a bunch of other MSI laptops the MS-1039 uses a 0c45:627b SN9C201 + OV7660 webcam which is mounted upside down.
Add it to the sn9c20x flip_dmi_table to deal with this.
--- drivers/media/usb/gspca/sn9c20x.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/media/usb/gspca/sn9c20x.c +7 -0
@@ -139,6 +139,13 @@ static const struct dmi_system_id flip_d } }, { + .ident = "MSI MS-1039", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"MICRO-STAR INT'L CO.,LTD." ), + DMI_MATCH(DMI_PRODUCT_NAME, "MS-1039"), + } + }, + { .ident ="MSI MS-1632" , .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "MSI"),
Greg Kroah-Hartman
maintainerPATCH 85/99 ASoC: Intel: Fix use of potentially uninitialized variable
In reply to Greg Kroah-HartmanFrom: Amadeusz Sławiński <[email protected]>
commit 810f3b860850148788fc1ed8a6f5f807199fed65 upstream.
If ipc->ops.reply_msg_match is NULL, we may end up using uninitialized mask value.
reported by smatch:sound/soc/intel/common/sst-ipc.c:266 sst_ipc_reply_find_msg() error: uninitialized symbol 'mask'.
--- sound/soc/intel/common/sst-ipc.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/intel/common/sst-ipc.c +2 -0
@@ -211,6 +211,8 @@ struct ipc_message *sst_ipc_reply_find_mif (ipc->ops.reply_msg_match !=NULL ) header = ipc->ops.reply_msg_match (header, &mask); +else + mask = (u64)-1 ;if (list_empty (&ipc->rx_list)) { dev_err(ipc->dev, "error: rx list empty but received 0x%llx\n",
Greg Kroah-Hartman
maintainerPATCH 86/99 ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
In reply to Greg Kroah-HartmanFrom: Luis Araneda <[email protected]>
commit b7005d4ef4f3aa2dc24019ffba03a322557ac43d upstream.
This fixes a kernel panic on memcpy whenFORTIFY_SOURCE is enabled.
The initial smp implementation on commit aa7eb2bb4e4a ("arm: zynq: Add smp support")
used memcpy, which worked fine until commit ee333554fed5 ("ARM: 8749/1: Kconfig: Add ARCH_HAS_FORTIFY_SOURCE") enabled overflow checks at runtime, producing a read overflow panic.
The computed size of memcpy args are:
- p_size (dst): 4294967295 = (size_t) -1
- q_size (src): 1
- size (len): 8
Additionally, the memory is marked as __iomem, so one of the memcpy_* functions should be used for read/write.
--- arch/arm/mach-zynq/platsmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-zynq/platsmp.c +1 -1
@@ -65,7 +65,7 @@ int zynq_cpun_start(u32 address, int cpu* 0x4: Jump by mov instruction * 0x8: Jumping address */ -memcpy ((__force void *)zero, &zynq_secondary_trampoline, +memcpy_toio (zero, &zynq_secondary_trampoline, trampoline_size);writel (address, zero + trampoline_size);
Greg Kroah-Hartman
maintainerPATCH 87/99 alarmtimer: Use EOPNOTSUPP instead of ENOTSUPP
In reply to Greg Kroah-HartmanFrom: Thadeu Lima de Souza Cascardo <[email protected]>
commit f18ddc13af981ce3c7b7f26925f099e7c6929aba upstream.
ENOTSUPP is not supposed to be returned to userspace. This was found on an OpenPower machine, where the RTC does not support set_alarm.
On that system, a clock_nanosleep(CLOCK_REALTIME_ALARM, ...) results in "524 Unknown error 524"
Replace it with EOPNOTSUPP which results in the expected "95 Operation not supported" error.
--- kernel/time/alarmtimer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/time/alarmtimer.c +2 -2
@@ -530,7 +530,7 @@ static int alarm_timer_create(struct k_istruct alarm_base *base;if (!alarmtimer_get_rtcdev ()) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (!capable (CAP_WAKE_ALARM ))return -EPERM ;
@@ -759,7 +759,7 @@ static int alarm_timer_nsleep(const clocstruct restart_block *restart;if (!alarmtimer_get_rtcdev ()) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (flags & ~TIMER_ABSTIME )return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 88/99 md/raid6: Set R5_ReadError when there is read failure on parity disk
In reply to Greg Kroah-HartmanFrom: Xiao Ni <[email protected]>
commit 143f6e733b73051cd22dcb80951c6c929da413ce upstream.
7471fb77ce4d ("md/raid6: Fix anomily when recovering a single device in RAID6.") avoids rereading P when it can be computed from other members. However, this misses the chance to re-write the right data to P. This patch sets R5_ReadError if the re-read fails.
Also, when re-read is skipped, we also missed the chance to reset rdev->read_errors to 0. It can fail the disk when there are many read errors on P member disk (other disks don't have read error)
V2: upper layer read request don't read parity/Q data. So there is no need to consider such situation.
This is Reported-by: kbuild test robot <[email protected]>
--- drivers/md/raid5.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/md/raid5.c +3 -1
@@ -2394,7 +2394,9 @@ static void raid5_end_read_request(struc && !test_bit(R5_ReadNoMerge, &sh->dev[i].flags)) retry =1 ;if (retry) -if (test_bit (R5_ReadNoMerge, &sh->dev[i].flags)) { +if (sh->qd_idx >=0 && sh->pd_idx == i) +set_bit (R5_ReadError, &sh->dev[i].flags); +else if (test_bit (R5_ReadNoMerge, &sh->dev[i].flags)) {set_bit (R5_ReadError, &sh->dev[i].flags);clear_bit (R5_ReadNoMerge, &sh->dev[i].flags); }else
Greg Kroah-Hartman
maintainerPATCH 89/99 cfg80211: Purge frame registrations on iftype change
In reply to Greg Kroah-HartmanFrom: Denis Kenzior <[email protected]>
commit c1d3ad84eae35414b6b334790048406bd6301b12 upstream.
Currently frame registrations are not purged, even when changing the interface type. This can lead to potentially weird situations where frames possibly not allowed on a given interface type remain registered due to the type switching happening after registration.
The kernel currently relies on userspace apps to actually purge the registrations themselves, this is not something that the kernel should rely on.
Add a call to cfg80211_mlme_purge_registrations() to forcefully remove any registrations left over prior to switching the iftype.
--- net/wireless/util.c | 1 + 1 file changed, 1 insertion(+)
net/wireless/util.c +1 -0
@@ -974,6 +974,7 @@ int cfg80211_change_iface(struct cfg8021 }cfg80211_process_rdev_events (rdev); +cfg80211_mlme_purge_registrations (dev->ieee80211_ptr); } err =rdev_change_virtual_intf (rdev, dev, ntype, flags, params);
Greg Kroah-Hartman
maintainerPATCH 90/99 /dev/mem: Bail out upon SIGKILL.
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
commit 8619e5bdeee8b2c685d686281f2d2a6017c4bc15 upstream.
syzbot found that a thread can stall for minutes inside read_mem() or write_mem() after that thread was killed by SIGKILL [1]. Reading from iomem areas of /dev/mem can be slow, depending on the hardware. While reading 2GB at one read() is legal, delaying termination of killed thread for minutes is bad. Thus, allow reading/writing /dev/mem and /dev/kmem to be preemptible and killable.
[ 1335.912419][T20577] read_mem: sz=4096 count=2134565632 [ 1335.943194][T20577] read_mem: sz=4096 count=2134561536 [ 1335.978280][T20577] read_mem: sz=4096 count=2134557440 [ 1336.011147][T20577] read_mem: sz=4096 count=2134553344 [ 1336.041897][T20577] read_mem: sz=4096 count=2134549248
Theoretically, reading/writing /dev/mem and /dev/kmem can become "interruptible". But this patch chose "killable". Future patch will make them "interruptible" so that we can revert to "killable" if some program regressed.
[1] https://syzkaller.appspot.com/bug?id=a0e3436829698d5824231251fad9d8e998f94f5e
--- drivers/char/mem.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/char/mem.c +21 -0
@@ -95,6 +95,13 @@ void __weak unxlate_dev_mem_ptr(phys_add }#endif +static inline bool should_stop_iteration (void ) +{ +if (need_resched ()) +cond_resched (); +return fatal_signal_pending (current); +} +/* * This funcion reads the *physical* memory. The f_pos points directly to the * memory location.
@@ -161,6 +168,8 @@ static ssize_t read_mem(struct file *fil p += sz; count -= sz; read += sz; +if (should_stop_iteration ()) +break ; } *ppos += read;
@@ -232,6 +241,8 @@ static ssize_t write_mem(struct file *fi p += sz; count -= sz; written += sz; +if (should_stop_iteration ()) +break ; } *ppos += written;
@@ -443,6 +454,10 @@ static ssize_t read_kmem(struct file *fi read += sz; low_count -= sz; count -= sz; +if (should_stop_iteration ()) { + count =0 ; +break ; + } } }
@@ -467,6 +482,8 @@ static ssize_t read_kmem(struct file *fi buf += sz; read += sz; p += sz; +if (should_stop_iteration ()) +break ; }free_page ((unsigned long )kbuf); }
@@ -517,6 +534,8 @@ static ssize_t do_write_kmem(unsigned lo p += sz; count -= sz; written += sz; +if (should_stop_iteration ()) +break ; } *ppos += written;
@@ -568,6 +587,8 @@ static ssize_t write_kmem(struct file *f buf += sz; virtr += sz; p += sz; +if (should_stop_iteration ()) +break ; }free_page ((unsigned long )kbuf); }
Greg Kroah-Hartman
maintainerPATCH 91/99 ext4: fix punch hole for inline_data file systems
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit c1e8220bd316d8ae8e524df39534b8a412a45d5e upstream.
If a program attempts to punch a hole on an inline data file, we need to convert it to a normal file first.
This was detected using ext4/032 using the adv configuration. Simple reproducer:
mke2fs -Fq -t ext4 -O inline_data /dev/vdc
mount /vdc
echo "" > /vdc/testfilexfs_io -c 'truncate 33554432' /vdc/testfilexfs_io -c 'fpunch 0 1048576' /vdc/testfile
umount /vdc
e2fsck -fy /dev/vdc
--- fs/ext4/inode.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/ext4/inode.c +9 -0
@@ -3705,6 +3705,15 @@ int ext4_punch_hole(struct inode *inode,trace_ext4_punch_hole (inode, offset, length,0 ); +ext4_clear_inode_state (inode,EXT4_STATE_MAY_INLINE_DATA ); +if (ext4_has_inline_data (inode)) { +down_write (&EXT4_I (inode)->i_mmap_sem); + ret =ext4_convert_inline_data (inode); +up_write (&EXT4_I (inode)->i_mmap_sem); +if (ret) +return ret; + } +/* * Write out all dirty pages to avoid race conditions * Then release them.
Greg Kroah-Hartman
maintainerPATCH 82/99 KVM: x86: set ctxt->have_exception in x86_decode_insn()
In reply to Greg Kroah-HartmanFrom: Jan Dakinevich <[email protected]>
commit c8848cee74ff05638e913582a476bde879c968ad upstream.
x86_emulate_instruction() takes into account ctxt->have_exception flag during instruction decoding, but in practice this flag is never set in x86_decode_insn().
--- arch/x86/kvm/emulate.c | 2 ++ arch/x86/kvm/x86.c | 6 ++++++ 2 files changed, 8 insertions(+)
arch/x86/kvm/emulate.c +2 -0
@@ -5245,6 +5245,8 @@ done_prefixes: ctxt->memopp->addr.mem.ea + ctxt->_eip); done: +if (rc ==X86EMUL_PROPAGATE_FAULT ) + ctxt->have_exception = true;return (rc !=X86EMUL_CONTINUE ) ?EMULATION_FAILED :EMULATION_OK ; }
arch/x86/kvm/x86.c +6 -0
@@ -5487,6 +5487,12 @@ int x86_emulate_instruction(struct kvm_v emulation_type))return EMULATE_DONE ;if (ctxt->have_exception) { +/* +* #UD should result in just EMULATION_FAILED, and trap-like +* exception should not be encountered during decode. +*/ +WARN_ON_ONCE (ctxt->exception.vector ==UD_VECTOR || +exception_type (ctxt->exception.vector) ==EXCPT_TRAP );inject_emulated_exception (vcpu);return EMULATE_DONE ; }
Greg Kroah-Hartman
maintainerPATCH 93/99 hwrng: core - dont wait on add_early_randomness()
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
commit 78887832e76541f77169a24ac238fccb51059b63 upstream.
add_early_randomness() is called by hwrng_register() when the hardware is added. If this hardware and its module are present at boot, and if there is no data available the boot hangs until data are available and can't be interrupted.
For instance, in the case of virtio-rng, in some cases the host can be not able to provide enough entropy for all the guests.
We can have two easy ways to reproduce the problem but they rely on misconfiguration of the hypervisor or the egd daemon:
- if virtio-rng device is configured to connect to the egd daemon of the host but when the virtio-rng driver asks for data the daemon is not connected,
- if virtio-rng device is configured to connect to the egd daemon of the host but the egd daemon doesn't provide data.
The guest kernel will hang at boot until the virtio-rng driver provides enough data.
To avoid that, call rng_get_data() in non-blocking mode (wait=0) from add_early_randomness().
--- drivers/char/hw_random/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/hw_random/core.c +1 -1
@@ -88,7 +88,7 @@ static void add_early_randomness(structsize_t size =min_t (size_t,16 ,rng_buffer_size ());mutex_lock (&reading_mutex); - bytes_read =rng_get_data (rng, rng_buffer, size,1 ); + bytes_read =rng_get_data (rng, rng_buffer, size,0 );mutex_unlock (&reading_mutex);if (bytes_read >0 )add_device_randomness (rng_buffer, bytes_read);
Greg Kroah-Hartman
maintainerPATCH 94/99 i2c: riic: Clear NACK in tend isr
In reply to Greg Kroah-HartmanFrom: Chris Brandt <[email protected]>
commit a71e2ac1f32097fbb2beab098687a7a95c84543e upstream.
The NACKF flag should be cleared in INTRIICNAKI interrupt processing as description in HW manual.
This issue shows up quickly when PREEMPT_RT is applied and a device is probed that is not plugged in (like a touchscreen controller). The result is endless interrupts that halt system boot.
--- drivers/i2c/busses/i2c-riic.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-riic.c +1 -0
@@ -212,6 +212,7 @@ static irqreturn_t riic_tend_isr(int irqif (readb (riic->base +RIIC_ICSR2 ) &ICSR2_NACKF ) {/* We got a NACKIE */ readb (riic->base +RIIC_ICDRR );/* dummy read */ +riic_clear_set_bit (riic,ICSR2_NACKF ,0 ,RIIC_ICSR2 ); riic->err = -ENXIO ; }else if (riic->bytes_left) {return IRQ_NONE ;
Greg Kroah-Hartman
maintainerPATCH 48/99 ia64:unwind: fix double free for mod->arch.init_unw_table
In reply to Greg Kroah-HartmanFrom: chenzefeng <[email protected]>
[ Upstream commit c5e5c48c16422521d363c33cfb0dcf58f88c119b ]
The function free_module in file kernel/module.c as follow:
void free_module(struct module *mod) {
......
module_arch_cleanup(mod);
......
module_arch_freeing_init(mod);
......
}Both module_arch_cleanup and module_arch_freeing_init function would free the mod->arch.init_unw_table, which cause double free.
Here, set mod->arch.init_unw_table = NULL after remove the unwind table to avoid double free.
--- arch/ia64/kernel/module.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/ia64/kernel/module.c +6 -2
@@ -912,8 +912,12 @@ module_finalize (const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, struct module *movoid module_arch_cleanup (struct module *mod) { -if (mod->arch.init_unw_table) +if (mod->arch.init_unw_table) {unw_remove_unwind_table (mod->arch.init_unw_table); -if (mod->arch.core_unw_table) + mod->arch.init_unw_table =NULL ; + } +if (mod->arch.core_unw_table) {unw_remove_unwind_table (mod->arch.core_unw_table); + mod->arch.core_unw_table =NULL ; + } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/99 ALSA: firewire-tascam: check intermediate state of clock status and retry
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
commit e1a00b5b253a4f97216b9a33199a863987075162 upstream.
2 bytes in MSB of register for clock status is zero during intermediate state after changing status of sampling clock in models of TASCAM FireWire series. The duration of this state differs depending on cases. During the state, it's better to retry reading the register for current status of the clock.
In current implementation, the intermediate state is checked only when getting current sampling transmission frequency, then retry reading. This care is required for the other operations to read the register.
This commit moves the codes of check and retry into helper function commonly used for operations to read the register.
--- sound/firewire/tascam/tascam-stream.c | 42 ++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 14 deletions(-)
sound/firewire/tascam/tascam-stream.c +28 -14
@@ -9,20 +9,37 @@#include <linux/delay.h> #include "tascam.h" +#define CLOCK_STATUS_MASK 0xffff0000 +#define CLOCK_CONFIG_MASK 0x0000ffff +#define CALLBACK_TIMEOUT 500static int get_clock (struct snd_tscm *tscm,u32 *data) { +int trial =0 ;__be32 reg;int err; - err =snd_fw_transaction (tscm->unit,TCODE_READ_QUADLET_REQUEST , -TSCM_ADDR_BASE +TSCM_OFFSET_CLOCK_STATUS , - ®,sizeof (reg),0 ); -if (err >=0 ) +while (trial++ <5 ) { + err =snd_fw_transaction (tscm->unit,TCODE_READ_QUADLET_REQUEST , +TSCM_ADDR_BASE +TSCM_OFFSET_CLOCK_STATUS , + ®,sizeof (reg),0 ); +if (err <0 ) +return err; + *data =be32_to_cpu (reg); +if (*data &CLOCK_STATUS_MASK ) +break ; + +// In intermediate state after changing clock status. +msleep (50 ); + } -return err; +// Still in the intermediate state. +if (trial >=5 ) +return -EAGAIN ; + +return 0 ; } static int set_clock(struct snd_tscm *tscm, unsigned int rate,
@@ -35,7 +52,7 @@ static int set_clock(struct snd_tscm *ts err =get_clock (tscm, &data);if (err <0 )return err; - data &=0x0000ffff ; + data &=CLOCK_CONFIG_MASK ;if (rate >0 ) { data &=0x000000ff ;
@@ -80,17 +97,14 @@ static int set_clock(struct snd_tscm *tsint snd_tscm_stream_get_rate (struct snd_tscm *tscm,unsigned int *rate) { -u32 data =0x0 ; -unsigned int trials =0 ; +u32 data;int err; -while (data ==0x0 || trials++ <5 ) { - err =get_clock (tscm, &data); -if (err <0 ) -return err; + err =get_clock (tscm, &data); +if (err <0 ) +return err; - data = (data &0xff000000 ) >>24 ; - } + data = (data &0xff000000 ) >>24 ;/* Check base rate. */ if ((data &0x0f ) ==0x01 )
Greg Kroah-Hartman
maintainerPATCH 79/99 fuse: fix missing unlock_page in fuse_writepage()
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
commit d5880c7a8620290a6c90ced7a0e8bd0ad9419601 upstream.
unlock_page() was missing in case of an already in-flight write against the same page.
--- fs/fuse/file.c | 1 + 1 file changed, 1 insertion(+)
fs/fuse/file.c +1 -0
@@ -1706,6 +1706,7 @@ static int fuse_writepage(struct page *pWARN_ON (wbc->sync_mode ==WB_SYNC_ALL );redirty_page_for_writepage (wbc, page); +unlock_page (page);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 66/99 md/raid1: fail run raid1 array when active disk less than one
In reply to Greg Kroah-HartmanFrom: Yufen Yu <[email protected]>
[ Upstream commit 07f1a6850c5d5a65c917c3165692b5179ac4cb6b ]
When run test case:
mdadm -CR /dev/md1 -l 1 -n 4 /dev/sd[a-d] --assume-clean --bitmap=internal mdadm -S /dev/md1
mdadm -A /dev/md1 /dev/sd[b-c] --run --force
mdadm --zero /dev/sda mdadm /dev/md1 -a /dev/sda
echo offline > /sys/block/sdc/device/state
echo offline > /sys/block/sdb/device/state
sleep 5
mdadm -S /dev/md1
echo running > /sys/block/sdb/device/state echo running > /sys/block/sdc/device/state mdadm -A /dev/md1 /dev/sd[a-c] --run --force
mdadm run fail with kernel message as follow:
[ 172.986064] md: kicking non-fresh sdb from array! [ 173.004210] md: kicking non-fresh sdc from array! [ 173.022383] md/raid1:md1: active with 0 out of 4 mirrors [ 173.022406] md1: failed to create bitmap (-5)
In fact, when active disk in raid1 array less than one, we need to return fail in raid1_run().
--- drivers/md/raid1.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/md/raid1.c +12 -1
@@ -2958,6 +2958,13 @@ static int run(struct mddev *mddev) !test_bit (In_sync, &conf->mirrors[i].rdev->flags) || test_bit(Faulty, &conf->mirrors[i].rdev->flags)) mddev->degraded++; +/* +* RAID1 needs at least one disk in active +*/ +if (conf->raid_disks - mddev->degraded <1 ) { + ret = -EINVAL ; + goto abort; + }if (conf->raid_disks - mddev->degraded ==1 ) mddev->recovery_cp = MaxSector;
@@ -2992,8 +2999,12 @@ static int run(struct mddev *mddev) ret =md_integrity_register (mddev);if (ret) {md_unregister_thread (&mddev->thread); -raid1_free (mddev, conf); + goto abort; } +return 0 ; + +abort: +raid1_free (mddev, conf);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/99 media: saa7134: fix terminology around saa7134_i2c_eeprom_md7134_gate()
In reply to Greg Kroah-HartmanFrom: Maciej S. Szmigiero <[email protected]>
[ Upstream commit 9d802222a3405599d6e1984d9324cddf592ea1f4 ]
saa7134_i2c_eeprom_md7134_gate() function and the associated comment uses an inverted i2c gate open / closed terminology.
Let's fix this.
--- drivers/media/pci/saa7134/saa7134-i2c.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/media/pci/saa7134/saa7134-i2c.c +8 -4
@@ -355,7 +355,11 @@ static struct i2c_client saa7134_client_template = {/* ----------------------------------------------------------- */ -/* On Medion 7134 reading EEPROM needs DVB-T demod i2c gate open */ +/* +* On Medion 7134 reading the SAA7134 chip config EEPROM needs DVB-T +* demod i2c gate closed due to an address clash between this EEPROM +* and the demod one. +*/ static void saa7134_i2c_eeprom_md7134_gate (struct saa7134_dev *dev) {u8 subaddr =0x7 , dmdregval;
@@ -372,14 +376,14 @@ static void saa7134_i2c_eeprom_md7134_gate(struct saa7134_dev *dev) ret =i2c_transfer (&dev->i2c_adap, i2cgatemsg_r,2 );if ((ret ==2 ) && (dmdregval &0x2 )) { -pr_debug ("%s: DVB-T demod i2c gate was left closed\n" , +pr_debug ("%s: DVB-T demod i2c gate was left open\n" , dev->name); data[0 ] = subaddr; data[1 ] = (dmdregval & ~0x2 );if (i2c_transfer (&dev->i2c_adap, i2cgatemsg_w,1 ) !=1 ) -pr_err ("%s: EEPROM i2c gate open failure\n" , - dev->name); +pr_err ("%s: EEPROM i2c gate close failure\n" , + dev->name); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/99 media: cpia2_usb: fix memory leaks
In reply to Greg Kroah-HartmanFrom: Wenwen Wang <[email protected]>
[ Upstream commit 1c770f0f52dca1a2323c594f01f5ec6f1dddc97f ]
In submit_urbs(), 'cam->sbuf[i].data' is allocated through kmalloc_array(). However, it is not deallocated if the following allocation for urbs fails. To fix this issue, free 'cam->sbuf[i].data' if usb_alloc_urb() fails.
--- drivers/media/usb/cpia2/cpia2_usb.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/usb/cpia2/cpia2_usb.c +4 -0
@@ -665,6 +665,10 @@ static int submit_urbs(struct camera_data *cam)ERR ("%s: usb_alloc_urb error!\n" , __func__);for (j =0 ; j < i; j++)usb_free_urb (cam->sbuf[j].urb); +for (j =0 ; j <NUM_SBUF ; j++) { +kfree (cam->sbuf[j].data); + cam->sbuf[j].data =NULL ; + }return -ENOMEM ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/99 media: omap3isp: Dont set streaming state on random subdevs
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
[ Upstream commit 7ef57be07ac146e70535747797ef4aee0f06e9f9 ]
The streaming state should be set to the first upstream sub-device only, not everywhere, for a sub-device driver itself knows how to best control the streaming state of its own upstream sub-devices.
--- drivers/media/platform/omap3isp/isp.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/media/platform/omap3isp/isp.c +8 -0
@@ -917,6 +917,10 @@ static int isp_pipeline_enable(struct isp_pipeline *pipe, s_stream, mode); pipe->do_propagation = true; } + +/* Stop at the first external sub-device. */ +if (subdev->dev != isp->dev) +break ; }return 0 ;
@@ -1031,6 +1035,10 @@ static int isp_pipeline_disable(struct isp_pipeline *pipe) isp->crashed |=1U << subdev->entity.id; failure = -ETIMEDOUT ; } + +/* Stop at the first external sub-device. */ +if (subdev->dev != isp->dev) +break ; }return failure;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/99 efi: cper: print AER info of PCIe fatal error
In reply to Greg Kroah-HartmanFrom: Xiaofei Tan <[email protected]>
[ Upstream commit b194a77fcc4001dc40aecdd15d249648e8a436d1 ]
AER info of PCIe fatal error is not printed in the current driver. Because APEI driver will panic directly for fatal error, and can't run to the place of printing AER info.
An example log is as following:
{763}[Hardware Error]: Hardware error from APEI Generic Hardware Error Source: 11 {763}[Hardware Error]: event severity: fatal
{763}[Hardware Error]: Error 0, type: fatal
{763}[Hardware Error]: section_type: PCIe error
{763}[Hardware Error]: port_type: 0, PCIe end point
{763}[Hardware Error]: version: 4.0
{763}[Hardware Error]: command: 0x0000, status: 0x0010
{763}[Hardware Error]: device_id: 0000:82:00.0
{763}[Hardware Error]: slot: 0
{763}[Hardware Error]: secondary_bus: 0x00
{763}[Hardware Error]: vendor_id: 0x8086, device_id: 0x10fb
{763}[Hardware Error]: class_code: 000002
Kernel panic - not syncing: Fatal hardware error!This issue was imported by the patch, '37448adfc7ce ("aerdrv: Move cper_print_aer() call out of interrupt context")'. To fix this issue, this patch adds print of AER info in cper_print_pcie() for fatal error.
Here is the example log after this patch applied:
{24}[Hardware Error]: Hardware error from APEI Generic Hardware Error Source: 10 {24}[Hardware Error]: event severity: fatal
{24}[Hardware Error]: Error 0, type: fatal
{24}[Hardware Error]: section_type: PCIe error
{24}[Hardware Error]: port_type: 0, PCIe end point
{24}[Hardware Error]: version: 4.0
{24}[Hardware Error]: command: 0x0546, status: 0x4010
{24}[Hardware Error]: device_id: 0000:01:00.0
{24}[Hardware Error]: slot: 0
{24}[Hardware Error]: secondary_bus: 0x00
{24}[Hardware Error]: vendor_id: 0x15b3, device_id: 0x1019
{24}[Hardware Error]: class_code: 000002
{24}[Hardware Error]: aer_uncor_status: 0x00040000, aer_uncor_mask: 0x00000000
{24}[Hardware Error]: aer_uncor_severity: 0x00062010
{24}[Hardware Error]: TLP Header: 000000c0 01010000 00000001 00000000
Kernel panic - not syncing: Fatal hardware error!--- drivers/firmware/efi/cper.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/firmware/efi/cper.c +15 -0
@@ -384,6 +384,21 @@ static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie,printk ("%s""bridge: secondary_status: 0x%04x, control: 0x%04x\n" , pfx, pcie->bridge.secondary_status, pcie->bridge.control); + +/* Fatal errors call __ghes_panic() before AER handler prints this */ +if ((pcie->validation_bits &CPER_PCIE_VALID_AER_INFO ) && + (gdata->error_severity &CPER_SEV_FATAL )) { +struct aer_capability_regs *aer; + + aer = (struct aer_capability_regs *)pcie->aer_info; +printk ("%saer_uncor_status: 0x%08x, aer_uncor_mask: 0x%08x\n" , + pfx, aer->uncor_status, aer->uncor_mask); +printk ("%saer_uncor_severity: 0x%08x\n" , + pfx, aer->uncor_severity); +printk ("%sTLP Header: %08x %08x %08x %08x\n" , pfx, + aer->header_log.dw0, aer->header_log.dw1, + aer->header_log.dw2, aer->header_log.dw3); + } } static void cper_estatus_print_section(
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainercover 4.4.195-stable review
This is the start of the stable review cycle for the 4.4.195 release. There are 99 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 05 Oct 2019 03:37:47 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.195-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.4.195-rc1
Filipe Manana <[email protected]>
Btrfs: fix race setting up and completing qgroup rescan workers
Nikolay Borisov <[email protected]>
btrfs: Relinquish CPUs in btrfs_compare_trees
Filipe Manana <[email protected]>
Btrfs: fix use-after-free when using the tree modification log
Mark Salyzyn <[email protected]>
ovl: filter of trusted xattr results in audit
Pavel Shilovsky <[email protected]>
CIFS: Fix oplock handling for SMB 2.1+ protocols
Chris Brandt <[email protected]>
i2c: riic: Clear NACK in tend isr
Laurent Vivier <[email protected]>
hwrng: core - don't wait on add_early_randomness()
Chao Yu <[email protected]>
quota: fix wrong condition in is_quota_modification()
Theodore Ts'o <[email protected]>
ext4: fix punch hole for inline_data file systems
Tetsuo Handa <[email protected]>
/dev/mem: Bail out upon SIGKILL.
Denis Kenzior <[email protected]>
cfg80211: Purge frame registrations on iftype change
Xiao Ni <[email protected]>
md/raid6: Set R5_ReadError when there is read failure on parity disk
Thadeu Lima de Souza Cascardo <[email protected]>
alarmtimer: Use EOPNOTSUPP instead of ENOTSUPP
Luis Araneda <[email protected]>
ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
Amadeusz Sławiński <[email protected]>
ASoC: Intel: Fix use of potentially uninitialized variable
Hans de Goede <[email protected]>
media: sn9c20x: Add MSI MS-1039 laptop to flip_dmi_table
Sean Christopherson <[email protected]>
KVM: x86: Manually calculate reserved bits when loading PDPTRS
Jan Dakinevich <[email protected]>
KVM: x86: set ctxt->have_exception in x86_decode_insn()
Jan Dakinevich <[email protected]>
KVM: x86: always stop emulation on page fault
Helge Deller <[email protected]>
parisc: Disable HP HSC-PCI Cards to prevent kernel crash
Vasily Averin <[email protected]>
fuse: fix missing unlock_page in fuse_writepage()
Vincent Whitchurch <[email protected]>
printk: Do not lose last line in kmsg buffer dump
Takashi Sakamoto <[email protected]>
ALSA: firewire-tascam: check intermediate state of clock status and retry
Takashi Sakamoto <[email protected]>
ALSA: firewire-tascam: handle error code when getting current source of clock
Sakari Ailus <[email protected]>
media: omap3isp: Set device on omap3isp subdevs
Qu Wenruo <[email protected]>
btrfs: extent-tree: Make sure we only allocate extents from block groups with the same type
Takashi Iwai <[email protected]>
ALSA: hda/realtek - Blacklist PC beep for Lenovo ThinkCentre M73/93
Tomas Bortoli <[email protected]>
media: ttusb-dec: Fix info-leak in ttusb_dec_send_command()
Kevin Easton <[email protected]>
libertas: Add missing sentinel at end of if_usb.c fw_table
Al Cooper <[email protected]>
mmc: sdhci: Fix incorrect switch to HS mode
Peter Ujfalusi <[email protected]>
ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set
Masami Hiramatsu <[email protected]>
kprobes: Prohibit probing on BUG() and WARN() address
Peter Ujfalusi <[email protected]>
dmaengine: ti: edma: Do not reset reserved paRAM slots
Yufen Yu <[email protected]>
md/raid1: fail run raid1 array when active disk less than one
Wang Shenran <[email protected]>
hwmon: (acpi_power_meter) Change log level for 'unsafe software power cap'
Wenwen Wang <[email protected]>
ACPI: custom_method: fix memory leaks
Tzvetomir Stoyanov <[email protected]>
libtraceevent: Change users plugin directory
Al Stone <[email protected]>
ACPI / CPPC: do not require the _PSD method
Mauro Carvalho Chehab <[email protected]>
media: ov9650: add a sanity check
Maciej S. Szmigiero <[email protected]>
media: saa7134: fix terminology around saa7134_i2c_eeprom_md7134_gate()
Wenwen Wang <[email protected]>
media: cpia2_usb: fix memory leaks
Wenwen Wang <[email protected]>
media: saa7146: add cleanup in hexium_attach()
Hans Verkuil <[email protected]>
media: hdpvr: add terminating 0 at end of string
Hans Verkuil <[email protected]>
media: radio/si470x: kill urb on error
Arnd Bergmann <[email protected]>
net: lpc-enet: fix printk format strings
Sakari Ailus <[email protected]>
media: omap3isp: Don't set streaming state on random subdevs
Arnd Bergmann <[email protected]>
dmaengine: iop-adma: use correct printk format strings
Hans Verkuil <[email protected]>
media: gspca: zero usb_buf on error
Xiaofei Tan <[email protected]>
efi: cper: print AER info of PCIe fatal error
Guoqing Jiang <[email protected]>
md: don't set In_sync if array is frozen
Guoqing Jiang <[email protected]>
md: don't call spare_active in md_reap_sync_thread if all member devices can't work
chenzefeng <[email protected]>
ia64:unwind: fix double free for mod->arch.init_unw_table
Ard van Breemen <[email protected]>
ALSA: usb-audio: Skip bSynchAddress endpoint check if it is invalid
Vinod Koul <[email protected]>
base: soc: Export soc_device_register/unregister APIs
Oliver Neukum <[email protected]>
media: iguanair: add sanity checks
Jia-Ju Bai <[email protected]>
ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls()
Takashi Iwai <[email protected]>
ALSA: hda - Show the fatal CORB/RIRB error more clearly
Thomas Gleixner <[email protected]>
x86/apic: Soft disable APIC before initializing it
Grzegorz Halat <[email protected]>
x86/reboot: Always use NMI fallback when shutdown via reboot vector IPI fails
Juri Lelli <[email protected]>
sched/core: Fix CPU controller for !RT_GROUP_SCHED
Vincent Guittot <[email protected]>
sched/fair: Fix imbalance due to CPU affinity
Luke Nowakowski-Krijger <[email protected]>
media: hdpvr: Add device num check and handling
Arnd Bergmann <[email protected]>
media: dib0700: fix link error for dibx000_i2c_set_speed
Nick Stoughton <[email protected]>
leds: leds-lp5562 allow firmware files up to the maximum length
Stefan Wahren <[email protected]>
dmaengine: bcm2835: Print error in case setting DMA mask fails
Oleksandr Suvorov <[email protected]>
ASoC: sgtl5000: Fix charge pump source assignment
Chris Wilson <[email protected]>
ALSA: hda: Flush interrupts on disabling
Ori Nimron <[email protected]>
nfc: enforce CAP_NET_RAW for raw sockets
Ori Nimron <[email protected]>
ieee802154: enforce CAP_NET_RAW for raw sockets
Ori Nimron <[email protected]>
ax25: enforce CAP_NET_RAW for raw sockets
Ori Nimron <[email protected]>
appletalk: enforce CAP_NET_RAW for raw sockets
Ori Nimron <[email protected]>
mISDN: enforce CAP_NET_RAW for raw sockets
Oliver Neukum <[email protected]>
usbnet: sanity checking of packet sizes and device mtu
Bjørn Mork <[email protected]>
usbnet: ignore endpoints with invalid wMaxPacketSize
Stephen Hemminger <[email protected]>
skge: fix checksum byte order
Eric Dumazet <[email protected]>
sch_netem: fix a divide by zero in tabledist()
Li RongQing <[email protected]>
openvswitch: change type of UPCALL_PID attribute to NLA_UNSPEC
Peter Mamonov <[email protected]>
net/phy: fix DP83865 10 Mbps HDX loopback disable function
Bjørn Mork <[email protected]>
cdc_ncm: fix divide-by-zero caused by invalid wMaxPacketSize
Uwe Kleine-König <[email protected]>
arcnet: provide a buffer big enough to actually receive packets
Jian-Hong Pan <[email protected]>
Bluetooth: btrtl: Additional Realtek 8822CE Bluetooth devices
Chris Wilson <[email protected]>
drm: Flush output polling on shutdown
Chao Yu <[email protected]>
f2fs: fix to do sanity check on segment bitmap of LFS curseg
Chao Yu <[email protected]>
Revert "f2fs: avoid out-of-range memory access"
Surbhi Palande <[email protected]>
f2fs: check all the data segments against all node ones
Marc Zyngier <[email protected]>
irqchip/gic-v3-its: Fix LPI release for Multi-MSI devices
Waiman Long <[email protected]>
locking/lockdep: Add debug_locks check in __lock_downgrade()
Yu Wang <[email protected]>
mac80211: handle deauthentication/disassociation from TDLS peer
Arkadiusz Miskiewicz <[email protected]>
mac80211: Print text for disassociation reason
Shih-Yuan Lee (FourDollars) <[email protected]>
ALSA: hda - Add laptop imic fixup for ASUS M9V laptop
Takashi Iwai <[email protected]>
ASoC: fsl: Fix of-node refcount unbalance in fsl_ssi_probe_from_dt()
Mao Wenan <[email protected]>
net: rds: Fix NULL ptr use in rds_tcp_kill_sock
Gustavo A. R. Silva <[email protected]>
crypto: talitos - fix missing break in switch statement
Tokunori Ikegami <[email protected]>
mtd: cfi_cmdset_0002: Use chip_good() to retry in do_write_oneword()
Alan Stern <[email protected]>
HID: hidraw: Fix invalid read in hidraw_ioctl
Alan Stern <[email protected]>
HID: logitech: Fix general protection fault caused by Logitech driver
Benjamin Tissoires <[email protected]>
HID: lg: make transfer buffers DMA capable
Alan Stern <[email protected]>
HID: prodikeys: Fix general protection fault during probe
Marcel Holtmann <[email protected]>
Revert "Bluetooth: validate BLE connection interval updates"
-------------
Diffstat:
Makefile | 4 +-- arch/arm/mach-zynq/platsmp.c | 2 +- arch/ia64/kernel/module.c | 8 +++-- arch/x86/kernel/apic/apic.c | 8 +++++ arch/x86/kernel/smp.c | 46 ++++++++++++++++----------- arch/x86/kvm/emulate.c | 2 ++ arch/x86/kvm/x86.c | 21 +++++++++--- drivers/acpi/cppc_acpi.c | 6 ++-- drivers/acpi/custom_method.c | 5 ++- drivers/base/soc.c | 2 ++ drivers/bluetooth/btusb.c | 3 ++ drivers/char/hw_random/core.c | 2 +- drivers/char/mem.c | 21 ++++++++++++ drivers/crypto/talitos.c | 1 + drivers/dma/bcm2835-dma.c | 4 ++- drivers/dma/edma.c | 9 ++++-- drivers/dma/iop-adma.c | 18 +++++------ drivers/firmware/efi/cper.c | 15 +++++++++ drivers/gpu/drm/drm_probe_helper.c | 9 +++++- drivers/hid/hid-lg.c | 22 +++++++++---- drivers/hid/hid-lg4ff.c | 1 - drivers/hid/hid-prodikeys.c | 12 +++++-- drivers/hid/hidraw.c | 2 +- drivers/hwmon/acpi_power_meter.c | 4 +-- drivers/i2c/busses/i2c-riic.c | 1 + drivers/irqchip/irq-gic-v3-its.c | 9 +++--- drivers/isdn/mISDN/socket.c | 2 ++ drivers/leds/leds-lp5562.c | 6 +++- drivers/md/md.c | 14 ++++++-- drivers/md/raid1.c | 13 +++++++- drivers/md/raid5.c | 4 ++- drivers/media/i2c/ov9650.c | 5 +++ drivers/media/pci/saa7134/saa7134-i2c.c | 12 ++++--- drivers/media/pci/saa7146/hexium_gemini.c | 3 ++ drivers/media/platform/omap3isp/isp.c | 8 +++++ drivers/media/platform/omap3isp/ispccdc.c | 1 + drivers/media/platform/omap3isp/ispccp2.c | 1 + drivers/media/platform/omap3isp/ispcsi2.c | 1 + drivers/media/platform/omap3isp/isppreview.c | 1 + drivers/media/platform/omap3isp/ispresizer.c | 1 + drivers/media/platform/omap3isp/ispstat.c | 2 ++ drivers/media/radio/si470x/radio-si470x-usb.c | 5 ++- drivers/media/rc/iguanair.c | 15 ++++----- drivers/media/usb/cpia2/cpia2_usb.c | 4 +++ drivers/media/usb/dvb-usb/dib0700_devices.c | 8 +++++ drivers/media/usb/gspca/konica.c | 5 +++ drivers/media/usb/gspca/nw80x.c | 5 +++ drivers/media/usb/gspca/ov519.c | 10 ++++++ drivers/media/usb/gspca/ov534.c | 5 +++ drivers/media/usb/gspca/ov534_9.c | 1 + drivers/media/usb/gspca/se401.c | 5 +++ drivers/media/usb/gspca/sn9c20x.c | 12 +++++++ drivers/media/usb/gspca/sonixb.c | 5 +++ drivers/media/usb/gspca/sonixj.c | 5 +++ drivers/media/usb/gspca/spca1528.c | 5 +++ drivers/media/usb/gspca/sq930x.c | 5 +++ drivers/media/usb/gspca/sunplus.c | 5 +++ drivers/media/usb/gspca/vc032x.c | 5 +++ drivers/media/usb/gspca/w996Xcf.c | 5 +++ drivers/media/usb/hdpvr/hdpvr-core.c | 13 +++++++- drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +- drivers/mmc/host/sdhci.c | 4 ++- drivers/mtd/chips/cfi_cmdset_0002.c | 18 +++++++---- drivers/net/arcnet/arcnet.c | 31 ++++++++++-------- drivers/net/ethernet/marvell/skge.c | 2 +- drivers/net/ethernet/nxp/lpc_eth.c | 13 ++++---- drivers/net/phy/national.c | 9 ++++-- drivers/net/usb/cdc_ncm.c | 6 +++- drivers/net/usb/usbnet.c | 8 +++++ drivers/net/wireless/libertas/if_usb.c | 3 +- drivers/parisc/dino.c | 24 ++++++++++++++ fs/btrfs/ctree.c | 5 ++- fs/btrfs/extent-tree.c | 8 +++++ fs/btrfs/qgroup.c | 33 +++++++++++-------- fs/cifs/smb2ops.c | 5 +++ fs/ext4/inode.c | 9 ++++++ fs/f2fs/segment.c | 44 ++++++++++++++++++++++--- fs/f2fs/super.c | 4 +-- fs/fuse/file.c | 1 + fs/overlayfs/inode.c | 3 +- include/linux/bug.h | 5 +++ include/linux/quotaops.h | 2 +- kernel/kprobes.c | 3 +- kernel/locking/lockdep.c | 3 ++ kernel/printk/printk.c | 2 +- kernel/sched/core.c | 4 --- kernel/sched/fair.c | 5 +-- kernel/time/alarmtimer.c | 4 +-- net/appletalk/ddp.c | 5 +++ net/ax25/af_ax25.c | 2 ++ net/bluetooth/hci_event.c | 5 --- net/bluetooth/l2cap_core.c | 9 +----- net/ieee802154/socket.c | 3 ++ net/mac80211/ieee80211_i.h | 3 ++ net/mac80211/mlme.c | 17 ++++++++-- net/mac80211/tdls.c | 23 ++++++++++++++ net/nfc/llcp_sock.c | 7 ++-- net/openvswitch/datapath.c | 2 +- net/rds/tcp.c | 8 +++-- net/sched/sch_netem.c | 2 +- net/wireless/util.c | 1 + sound/firewire/tascam/tascam-pcm.c | 3 ++ sound/firewire/tascam/tascam-stream.c | 42 ++++++++++++++++-------- sound/hda/hdac_controller.c | 2 ++ sound/i2c/other/ak4xxx-adda.c | 7 ++-- sound/pci/hda/hda_controller.c | 5 ++- sound/pci/hda/hda_intel.c | 2 +- sound/pci/hda/patch_analog.c | 1 + sound/pci/hda/patch_realtek.c | 3 ++ sound/soc/codecs/sgtl5000.c | 15 ++++++--- sound/soc/fsl/fsl_ssi.c | 5 ++- sound/soc/intel/common/sst-ipc.c | 2 ++ sound/soc/soc-generic-dmaengine-pcm.c | 6 ++++ sound/usb/pcm.c | 1 + tools/lib/traceevent/Makefile | 6 ++-- tools/lib/traceevent/event-plugin.c | 2 +- 116 files changed, 679 insertions(+), 204 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 7/99 crypto: talitos - fix missing break in switch statement
From: Gustavo A. R. Silva <[email protected]>
commit 5fc194ea6d34dfad9833d3043ce41d6c52aff39a upstream.
Add missing break statement in order to prevent the code from falling through to case CRYPTO_ALG_TYPE_AHASH.
--- drivers/crypto/talitos.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/talitos.c +1 -0
@@ -2730,6 +2730,7 @@ static int talitos_remove(struct platforbreak ;case CRYPTO_ALG_TYPE_AEAD :crypto_unregister_aead (&t_alg->algt.alg.aead); +break ;case CRYPTO_ALG_TYPE_AHASH :crypto_unregister_ahash (&t_alg->algt.alg.hash);break ;
Greg Kroah-Hartman
maintainerPATCH 39/99 sched/fair: Fix imbalance due to CPU affinity
In reply to Greg Kroah-HartmanFrom: Vincent Guittot <[email protected]>
[ Upstream commit f6cad8df6b30a5d2bbbd2e698f74b4cafb9fb82b ]
The load_balance() has a dedicated mecanism to detect when an imbalance is due to CPU affinity and must be handled at parent level. In this case, the imbalance field of the parent's sched_group is set.
The description of sg_imbalanced() gives a typical example of two groups of 4 CPUs each and 4 tasks each with a cpumask covering 1 CPU of the first group and 3 CPUs of the second group. Something like:
{ 0 1 2 3 } { 4 5 6 7 }
* * * *But the load_balance fails to fix this UC on my octo cores system made of 2 clusters of quad cores.
Whereas the load_balance is able to detect that the imbalanced is due to CPU affinity, it fails to fix it because the imbalance field is cleared before letting parent level a chance to run. In fact, when the imbalance is detected, the load_balance reruns without the CPU with pinned tasks. But there is no other running tasks in the situation described above and everything looks balanced this time so the imbalance field is immediately cleared.
The imbalance field should not be cleared if there is no other task to move when the imbalance is detected.
--- kernel/sched/fair.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/sched/fair.c +3 -2
@@ -7313,9 +7313,10 @@ static int load_balance(int this_cpu, struct rq *this_rq, out_balanced:/* * We reach balance although we may have faced some affinity -* constraints. Clear the imbalance flag if it was set. +* constraints. Clear the imbalance flag only if other tasks got +* a chance to move and fix the imbalance. */ -if (sd_parent) { +if (sd_parent && !(env.flags &LBF_ALL_PINNED )) {int *group_imbalance = &sd_parent->groups->sgc->imbalance;if (*group_imbalance)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/99 HID: lg: make transfer buffers DMA capable
In reply to Greg Kroah-HartmanFrom: Benjamin Tissoires <[email protected]>
commit 061232f0d47fa10103f3efa3e890f002a930d902 upstream.
Kernel v4.9 strictly enforces DMA capable buffers, so we need to remove buffers allocated on the stack.
[[email protected]: fix up second usage of hid_hw_raw_request(), spotted by
0day build bot]
--- drivers/hid/hid-lg.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/hid/hid-lg.c +10 -4
@@ -701,11 +701,16 @@ static int lg_probe(struct hid_device *h/* Setup wireless link with Logitech Wii wheel */ if (hdev->product ==USB_DEVICE_ID_LOGITECH_WII_WHEEL ) { -unsigned char buf[] = {0x00 ,0xAF ,0x01 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; +const unsigned char cbuf[] = {0x00 ,0xAF ,0x01 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; +u8 *buf =kmemdup (cbuf,sizeof (cbuf),GFP_KERNEL ); - ret =hid_hw_raw_request (hdev, buf[0 ], buf,sizeof (buf), -HID_FEATURE_REPORT ,HID_REQ_SET_REPORT ); +if (!buf) { + ret = -ENOMEM ; + goto err_free; + } + ret =hid_hw_raw_request (hdev, buf[0 ], buf,sizeof (cbuf), +HID_FEATURE_REPORT ,HID_REQ_SET_REPORT );if (ret >=0 ) {/* insert a little delay of 10 jiffies ~ 40ms */ wait_queue_head_t wait;
@@ -717,9 +722,10 @@ static int lg_probe(struct hid_device *h buf[1 ] =0xB2 ;get_random_bytes (&buf[2 ],2 ); - ret =hid_hw_raw_request (hdev, buf[0 ], buf,sizeof (buf), + ret =hid_hw_raw_request (hdev, buf[0 ], buf,sizeof (cbuf),HID_FEATURE_REPORT ,HID_REQ_SET_REPORT ); } +kfree (buf); }if (drv_data->quirks &LG_FF )
Greg Kroah-Hartman
maintainerPATCH 22/99 net/phy: fix DP83865 10 Mbps HDX loopback disable function
In reply to Greg Kroah-HartmanFrom: Peter Mamonov <[email protected]>
[ Upstream commit e47488b2df7f9cb405789c7f5d4c27909fc597ae ]
According to the DP83865 datasheet "the 10 Mbps HDX loopback can be disabled in the expanded memory register 0x1C0.1". The driver erroneously used bit 0 instead of bit 1.
--- drivers/net/phy/national.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/phy/national.c +6 -3
@@ -110,14 +110,17 @@ static void ns_giga_speed_fallback(strucstatic void ns_10_base_t_hdx_loopack (struct phy_device *phydev,int disable) { +u16 lb_dis =BIT (1 ); +if (disable) -ns_exp_write (phydev,0x1c0 ,ns_exp_read (phydev,0x1c0 ) |1 ); +ns_exp_write (phydev,0x1c0 , +ns_exp_read (phydev,0x1c0 ) | lb_dis);else ns_exp_write (phydev,0x1c0 , -ns_exp_read (phydev,0x1c0 ) &0xfffe ); +ns_exp_read (phydev,0x1c0 ) & ~lb_dis);pr_debug ("10BASE-T HDX loopback %s\n" , - (ns_exp_read (phydev,0x1c0 ) &0x0001 ) ?"off" :"on" ); + (ns_exp_read (phydev,0x1c0 ) & lb_dis) ?"off" :"on" ); }static int ns_config_init (struct phy_device *phydev)
Greg Kroah-Hartman
maintainerPATCH 24/99 sch_netem: fix a divide by zero in tabledist()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit b41d936b5ecfdb3a4abc525ce6402a6c49cffddc ]
syzbot managed to crash the kernel in tabledist() loading an empty distribution table.
t = dist->table[rnd % dist->size];
Simply return an error when such load is attempted.
--- net/sched/sch_netem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_netem.c +1 -1
@@ -713,7 +713,7 @@ static int get_dist_table(struct Qdisc *int i;size_t s; -if (n >NETEM_DIST_MAX ) +if (!n || n >NETEM_DIST_MAX )return -EINVAL ; s =sizeof (struct disttable ) + n *sizeof (s16);
Greg Kroah-Hartman
maintainerPATCH 23/99 openvswitch: change type of UPCALL_PID attribute to NLA_UNSPEC
In reply to Greg Kroah-HartmanFrom: Li RongQing <[email protected]>
[ Upstream commit ea8564c865299815095bebeb4b25bef474218e4c ]
userspace openvswitch patch "(dpif-linux: Implement the API functions to allow multiple handler threads read upcall)" changes its type from U32 to UNSPEC, but leave the kernel unchanged
and after kernel 6e237d099fac "(netlink: Relax attr validation for fixed length types)", this bug is exposed by the below warning
[ 57.215841] netlink: 'ovs-vswitchd': attribute type 5 has an invalid length.
--- net/openvswitch/datapath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/openvswitch/datapath.c +1 -1
@@ -2152,7 +2152,7 @@ static const struct nla_policy vport_pol [OVS_VPORT_ATTR_STATS] = { .len = sizeof(struct ovs_vport_stats) }, [OVS_VPORT_ATTR_PORT_NO] = { .type = NLA_U32 }, [OVS_VPORT_ATTR_TYPE] = { .type = NLA_U32 }, - [OVS_VPORT_ATTR_UPCALL_PID] = { .type = NLA_U32 }, + [OVS_VPORT_ATTR_UPCALL_PID] = { .type = NLA_UNSPEC }, [OVS_VPORT_ATTR_OPTIONS] = { .type = NLA_NESTED }, };
Greg Kroah-Hartman
maintainerPATCH 16/99 Revert "f2fs: avoid out-of-range memory access"
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit a37d0862d17411edb67677a580a6f505ec2225f6 ]
As Pavel Machek reported:
"We normally use -EUCLEAN to signal filesystem corruption. Plus, it is good idea to report it to the syslog and mark filesystem as "needing fsck" if filesystem can do that."
Still we need improve the original patch with:
- use unlikely keyword
- add message print
- return EUCLEAN
However, after rethink this patch, I don't think we should add such condition check here as below reasons:
- We have already checked the field in f2fs_sanity_check_ckpt(),
- If there is fs corrupt or security vulnerability, there is nothing to guarantee the field is integrated after the check, unless we do the check before each of its use, however no filesystem does that.
- We only have similar check for bitmap, which was added due to there is bitmap corruption happened on f2fs' runtime in product.
- There are so many key fields in SB/CP/NAT did have such check after f2fs_sanity_check_{sb,cp,..}.
So I propose to revert this unneeded check.
This reverts commit 56f3ce675103e3fb9e631cfb4131fc768bc23e9a.
--- fs/f2fs/segment.c | 5 ----- 1 file changed, 5 deletions(-)
fs/f2fs/segment.c +0 -5
@@ -1510,11 +1510,6 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi) seg_i =CURSEG_I (sbi, i); segno =le32_to_cpu (ckpt->cur_data_segno[i]); blk_off =le16_to_cpu (ckpt->cur_data_blkoff[i]); -if (blk_off >ENTRIES_IN_SUM ) { -f2fs_bug_on (sbi,1 ); -f2fs_put_page (page,1 ); -return -EFAULT ; - } seg_i->next_segno = segno;reset_curseg (sbi, i,0 ); seg_i->alloc_type = ckpt->alloc_type[i];
Signature · 1 line
2.20.1
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.195 release. There are 99 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 05 Oct 2019 03:37:47 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.195-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.4.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
stable-rc/linux-4.4.y boot: 90 boots: 1 failed, 80 passed with 8 offline, 1 untried/unknown (v4.4.194-100-g9a8d8139a7e5)
stable-rc/linux-4.4.y boot: 90 boots: 1 failed, 80 passed with 8 offline, 1 untried/unknown (v4.4.194-100-g9a8d8139a7e5)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.4.y/kernel/v4.4.194-100-g9a8d8139a7e5/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.4.y/kernel/v4.4.194-100-g9a8d8139a7e5/
Tree: stable-rc
Branch: linux-4.4.y
Git Describe: v4.4.194-100-g9a8d8139a7e5
Git Commit: 9a8d8139a7e557ce81c19f467a2a873371e3deba
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 45 unique boards, 17 SoC families, 12 builds out of 190
Boot Failure Detected:
arm64:
defconfig:
gcc-8:
qcom-qdf2400: 1 failed labOffline Platforms:
arm:
qcom_defconfig:
gcc-8
qcom-apq8064-cm-qs600: 1 offline lab
qcom-apq8064-ifc6410: 1 offline lab
davinci_all_defconfig:
gcc-8
dm365evm,legacy: 1 offline lab
sunxi_defconfig:
gcc-8
sun5i-r8-chip: 1 offline lab
multi_v7_defconfig:
gcc-8
qcom-apq8064-cm-qs600: 1 offline lab
qcom-apq8064-ifc6410: 1 offline lab
sun5i-r8-chip: 1 offline labarm64:
defconfig:
gcc-8
apq8016-sbc: 1 offline lab---
For more info write to <[email protected]>
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.195 release. There are 99 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 05 Oct 2019 03:37:47 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.195-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.4.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v4.4:
6 builds: 6 pass, 0 fail
12 boots: 12 pass, 0 fail
19 tests: 19 pass, 0 failLinux version: 4.4.195-rc1-g9a8d8139a7e5
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra30-cardhu-a04
Cheers
Jon
Signature · 1 line
nvpublic
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.195 release. There are 99 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 05 Oct 2019 03:37:47 PM UTC. Anything received after that time might be too late.
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.4.195-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.4.y
git commit: 9a8d8139a7e557ce81c19f467a2a873371e3deba
git describe: v4.4.194-100-g9a8d8139a7e5
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.4-oe/build/v4.4.194-100-g9a8d8139a7e5
No regressions (compared to build v4.4.194)
No fixes (compared to build v4.4.194)
Ran 18728 total tests in the following environments and test suites.
Environments
--------------
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* build
* kselftest
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-open-posix-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* network-basic-tests
* perf
* prep-tmp-disk
* spectre-meltdown-checker-test
* kvm-unit-tests
* v4l2-compliance
* install-android-platform-tools-r2600
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
* ssuite
Summary
------------------------------------------------------------------------
kernel: 4.4.195-rc1
git repo: https://git.linaro.org/lkft/arm64-stable-rc.git
git branch: 4.4.195-rc1-hikey-20191003-572
git commit: 3f7eeb94b05eb384e0c0cee76d6446f60aba646f
git describe: 4.4.195-rc1-hikey-20191003-572
Test details: https://qa-reports.linaro.org/lkft/linaro-hikey-stable-rc-4.4-oe/build/4.4.195-rc1-hikey-20191003-572
No regressions (compared to build 4.4.195-rc1-hikey-20191001-571)
No fixes (compared to build 4.4.195-rc1-hikey-20191001-571)
Ran 1523 total tests in the following environments and test suites.
Environments
--------------
- hi6220-hikey - arm64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.195 release. There are 99 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 05 Oct 2019 03:37:47 PM UTC. Anything received after that time might be too late.
Build results:
total: 170 pass: 170 fail: 0 Qemu test results: total: 324 pass: 324 fail: 0
Guenter