4.4.185-stable review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 1/73 fs/binfmt_flat.c: make load_flat_shared_library() work
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit 867bfa4a5fcee66f2b25639acae718e8b28b25a5 upstream.
load_flat_shared_library() is broken: It only calls load_flat_file() if prepare_binprm() returns zero, but prepare_binprm() returns the number of bytes read - so this only happens if the file is empty.
Instead, call into load_flat_file() if the number of bytes read is non-negative. (Even if the number of bytes is zero - in that case, load_flat_file() will see nullbytes and return a nice -ENOEXEC.)
In addition, remove the code related to bprm creds and stop using prepare_binprm() - this code is loading a library, not a main executable, and it only actually uses the members "buf", "file" and "filename" of the linux_binprm struct. Instead, call kernel_read() directly.
--- fs/binfmt_flat.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-)
fs/binfmt_flat.c +7 -17
@@ -808,9 +808,14 @@ err:static int load_flat_shared_library (int id,struct lib_info *libs) { +/* +* This is a fake bprm struct; only the members "buf", "file" and +* "filename" are actually used. +*/ struct linux_binprm bprm;int res;char buf[16 ]; +loff_t pos =0 ;memset (&bprm,0 ,sizeof (bprm));
@@ -824,25 +829,10 @@ static int load_flat_shared_library(intif (IS_ERR (bprm.file))return res; - bprm.cred =prepare_exec_creds (); - res = -ENOMEM ; -if (!bprm.cred) - goto out; - -/* We don't really care about recalculating credentials at this point -* as we're past the point of no return and are dealing with shared -* libraries. -*/ - bprm.cred_prepared =1 ; - - res =prepare_binprm (&bprm); - -if (!IS_ERR_VALUE (res)) + res =kernel_read (bprm.file, pos, bprm.buf,BINPRM_BUF_SIZE ); +if (res >=0 ) res =load_flat_file (&bprm, libs, id,NULL ); -abort_creds (bprm.cred); - -out:allow_write_access (bprm.file);fput (bprm.file);
Greg Kroah-Hartman
maintainerPATCH 10/73 parisc: Fix compiler warnings in float emulation code
In reply to Greg Kroah-Hartman[ Upstream commit 6b98d9134e14f5ef4bcf64b27eedf484ed19a1ec ]
Avoid such compiler warnings:arch/parisc/math-emu/cnv_float.h:71:27: warning: ‘<<’ in boolean context, did you mean ‘<’ ? [-Wint-in-bool-context]
((Dintp1(dint_valueA) << 33 - SGL_EXP_LENGTH) || Dintp2(dint_valueB))
arch/parisc/math-emu/fcnvxf.c:257:6: note: in expansion of macro ‘Dint_isinexact_to_sgl’
if (Dint_isinexact_to_sgl(srcp1,srcp2)) {
--- arch/parisc/math-emu/cnv_float.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/parisc/math-emu/cnv_float.h +4 -4
@@ -60,19 +60,19 @@ ((exponent < (SGL_P -1 )) ? \ (Sall(sgl_value) << (SGL_EXP_LENGTH + 1 + exponent)) : FALSE) -#define Int_isinexact_to_sgl (int_value) (int_value << 33 - SGL_EXP_LENGTH) +#define Int_isinexact_to_sgl (int_value) ((int_value << 33 - SGL_EXP_LENGTH) != 0) #define Sgl_roundnearest_from_int(int_value,sgl_value) \ if (int_value & 1<<(SGL_EXP_LENGTH - 2)) /* round bit */ \ - if ((int_value << 34 - SGL_EXP_LENGTH) || Slow(sgl_value)) \ + if (((int_value << 34 - SGL_EXP_LENGTH) != 0) || Slow(sgl_value)) \ Sall(sgl_value)++#define Dint_isinexact_to_sgl (dint_valueA,dint_valueB) \ - ((Dintp1(dint_valueA) << 33 - SGL_EXP_LENGTH) || Dintp2(dint_valueB)) + (((Dintp1(dint_valueA) << 33 - SGL_EXP_LENGTH) != 0) || Dintp2(dint_valueB))#define Sgl_roundnearest_from_dint (dint_valueA,dint_valueB,sgl_value) \ if (Dintp1(dint_valueA) & 1<<(SGL_EXP_LENGTH - 2)) \ - if ((Dintp1(dint_valueA) << 34 - SGL_EXP_LENGTH) || \ + if (((Dintp1(dint_valueA) << 34 - SGL_EXP_LENGTH) != 0) || \ Dintp2(dint_valueB) || Slow(sgl_value)) Sall(sgl_value)++#define Dint_isinexact_to_dbl (dint_value) \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/73 IB/hfi1: Insure freeze_work work_struct is canceled on shutdown
In reply to Greg Kroah-Hartman[ Upstream commit 6d517353c70bb0818b691ca003afdcb5ee5ea44e ]
By code inspection, the freeze_work is never canceled.
Fix by adding a cancel_work_sync in the shutdown path to insure it is no longer running.
--- drivers/staging/rdma/hfi1/chip.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/rdma/hfi1/chip.c +1 -0
@@ -5906,6 +5906,7 @@ void hfi1_quiet_serdes(struct hfi1_pportdata *ppd)/* disable the port */ clear_rcvctrl (dd,RCV_CTRL_RCV_PORT_ENABLE_SMASK ); +cancel_work_sync (&ppd->freeze_work); }static inline int init_cpu_counters (struct hfi1_devdata *dd)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/73 MIPS: uprobes: remove set but not used variable epc
In reply to Greg Kroah-Hartman[ Upstream commit f532beeeff0c0a3586cc15538bc52d249eb19e7c ]
Fixes gcc '-Wunused-but-set-variable' warning:
arch/mips/kernel/uprobes.c: In function 'arch_uprobe_pre_xol':arch/mips/kernel/uprobes.c:115:17: warning: variable 'epc' set but not used [-Wunused-but-set-variable]
It's never used since introduction in commit 40e084a506eb ("MIPS: Add uprobes support.")
--- arch/mips/kernel/uprobes.c | 3 --- 1 file changed, 3 deletions(-)
arch/mips/kernel/uprobes.c +0 -3
@@ -164,9 +164,6 @@ int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs)*/ aup->resume_epc = regs->cp0_epc +4 ;if (insn_has_delay_slot ((union mips_instruction ) aup->insn[0 ])) { -unsigned long epc; - - epc = regs->cp0_epc;__compute_return_epc_for_insn (regs, (union mips_instruction ) aup->insn[0 ]); aup->resume_epc = regs->cp0_epc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/73 net: hns: Fix loopback test failed at copper ports
In reply to Greg Kroah-Hartman[ Upstream commit 2e1f164861e500f4e068a9d909bbd3fcc7841483 ]
When doing a loopback test at copper ports, the serdes loopback and the phy loopback will fail, because of the adjust link had not finished, and phy not ready.
Adds sleep between adjust link and test process to fix it.
--- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +4 -0
@@ -351,6 +351,7 @@ static int __lb_setup(struct net_device *ndev,static int __lb_up (struct net_device *ndev,enum hnae_loop loop_mode) { +#define NIC_LB_TEST_WAIT_PHY_LINK_TIME 300struct hns_nic_priv *priv =netdev_priv (ndev);struct hnae_handle *h = priv->ae_handle;int speed, duplex;
@@ -389,6 +390,9 @@ static int __lb_up(struct net_device *ndev, h->dev->ops->adjust_link (h, speed, duplex); +/* wait adjust link done and phy ready */ +msleep (NIC_LB_TEST_WAIT_PHY_LINK_TIME ); +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/73 sparc: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD
In reply to Greg Kroah-Hartman[ Upstream commit 56cd0aefa475079e9613085b14a0f05037518fed ]
The PERF_EVENT_IOC_PERIOD ioctl command can be used to change the sample period of a running perf_event. Consequently, when calculating the next event period, the new period will only be considered after the previous one has overflowed.
This patch changes the calculation of the remaining event ticks so that they are offset if the period has changed.
See commit 3581fe0ef37c ("ARM: 7556/1: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD") for details.
--- arch/sparc/kernel/perf_event.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/sparc/kernel/perf_event.c +4 -0
@@ -889,6 +889,10 @@ static int sparc_perf_event_set_period(struct perf_event *event,s64 period = hwc->sample_period;int ret =0 ; +/* The period may have been changed by PERF_EVENT_IOC_PERIOD */ +if (unlikely (period != hwc->last_period)) + left = period - (hwc->last_period - left); +if (unlikely (left <= -period)) { left = period;local64_set (&hwc->period_left, left);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/73 scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
In reply to Greg Kroah-Hartman[ Upstream commit 4f45d62a52297b10ded963412a158685647ecdec ]
The following error occurs for the make ARCH=arm64 checkstack case:
aarch64-linux-gnu-objdump -d vmlinux $(find . -name '*.ko') | \
perl ./scripts/checkstack.pl arm64
wrong or unknown architecture "arm64"
As suggested by Masahiro Yamada, fix the above error using regular expressions in the same way it was fixed for the ARCH=x86 case via commit fda9f9903be6 ("scripts/checkstack.pl: automatically handle 32-bit and 64-bit mode for ARCH=x86").
--- scripts/checkstack.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/checkstack.pl +1 -1
@@ -45,7 +45,7 @@ my (@stack, $re, $dre, $x, $xs, $funcre); $x = "[0-9a-f]"; # hex character $xs = "[0-9a-f ]"; # hex character or space $funcre = qr/^$x* <(.*)>:$/; - if ($arch eq 'aarch64') { + if ($arch =~ '^(aarch|arm)64$') { #ffffffc0006325cc: a9bb7bfd stp x29, x30, [sp, #-80]! $re = qr/^.*stp.*sp, \#-([0-9]{1,8})\]\!/o; } elsif ($arch eq 'arm') {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/73 scsi: ufs: Check that space was properly alloced in copy_query_response
In reply to Greg Kroah-Hartman[ Upstream commit 1c90836f70f9a8ef7b7ad9e1fdd8961903e6ced6 ]
struct ufs_dev_cmd is the main container that supports device management commands. In the case of a read descriptor request, we assume that the proper space was allocated in dev_cmd to hold the returning descriptor.
This is no longer true, as there are flows that doesn't use dev_cmd for device management requests, and was wrong in the first place.
--- drivers/scsi/ufs/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +2 -1
@@ -853,7 +853,8 @@ int ufshcd_copy_query_response(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)memcpy (&query_res->upiu_res, &lrbp->ucd_rsp_ptr->qr,QUERY_OSF_SIZE );/* Get the descriptor */ -if (lrbp->ucd_rsp_ptr->qr.opcode ==UPIU_QUERY_OPCODE_READ_DESC ) { +if (hba->dev_cmd.query.descriptor && + lrbp->ucd_rsp_ptr->qr.opcode ==UPIU_QUERY_OPCODE_READ_DESC ) {u8 *descp = (u8 *)lrbp->ucd_rsp_ptr +GENERAL_UPIU_REQUEST_SIZE ;u16 resp_len;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/73 s390/qeth: fix VLAN attribute in bridge_hostnotify udev event
In reply to Greg Kroah-Hartman[ Upstream commit 335726195e460cb6b3f795b695bfd31f0ea70ef0 ]
Enabling sysfs attribute bridge_hostnotify triggers a series of udev events for the MAC addresses of all currently connected peers. In case no VLAN is set for a peer, the device reports the corresponding MAC addresses with VLAN ID 4096. This currently results in attribute VLAN=4096 for all non-VLAN interfaces in the initial series of events after host-notify is enabled.
Instead, no VLAN attribute should be reported in the udev event for non-VLAN interfaces.
Only the initial events face this issue. For dynamic changes that are reported later, the device uses a validity flag.
This also changes the code so that it now sets the VLAN attribute for MAC addresses with VID 0. On Linux, no qeth interface will ever be registered with VID 0: Linux kernel registers VID 0 on all network interfaces initially, but qeth will drop .ndo_vlan_rx_add_vid for VID 0. Peers with other OSs could register MACs with VID 0.
--- drivers/s390/net/qeth_l2_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/net/qeth_l2_main.c +1 -1
@@ -2112,7 +2112,7 @@ static void qeth_bridgeport_an_set_cb(void *priv, l2entry = (struct qdio_brinfo_entry_l2 *)entry; code =IPA_ADDR_CHANGE_CODE_MACADDR ; -if (l2entry->addr_lnid.lnid) +if (l2entry->addr_lnid.lnid <VLAN_N_VID ) code |=IPA_ADDR_CHANGE_CODE_VLANID ; qeth_bridge_emit_host_event(card, anev_reg_unreg, code, (struct net_if_token *)&l2entry->nit,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/73 hwmon: (pmbus/core) Treat parameters as paged if on multiple pages
In reply to Greg Kroah-Hartman[ Upstream commit 4a60570dce658e3f8885bbcf852430b99f65aca5 ]
Some chips have attributes which exist on more than one page but the attribute is not presently marked as paged. This causes the attributes to be generated with the same label, which makes it impossible for userspace to tell them apart.
Marking all such attributes as paged would result in the page suffix being added regardless of whether they were present on more than one page or not, which might break existing setups. Therefore, we add a second check which treats the attribute as paged, even if not marked as such, if it is present on multiple pages.
--- drivers/hwmon/pmbus/pmbus_core.c | 34 ++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +30 -4
@@ -1028,14 +1028,15 @@ static int pmbus_add_sensor_attrs_one(struct i2c_client *client,const struct pmbus_driver_info *info, const char *name, int index, int page, - const struct pmbus_sensor_attr *attr) + const struct pmbus_sensor_attr *attr, + bool paged) { struct pmbus_sensor *base;int ret;if (attr->label) { ret =pmbus_add_label (data, name, index, attr->label, - attr->paged ? page +1 :0 ); + paged ? page +1 :0 );if (ret)return ret; }
@@ -1067,6 +1068,30 @@ static int pmbus_add_sensor_attrs_one(struct i2c_client *client,return 0 ; } +static bool pmbus_sensor_is_paged (const struct pmbus_driver_info *info, +const struct pmbus_sensor_attr *attr) +{ +int p; + +if (attr->paged) +return true; + +/* +* Some attributes may be present on more than one page despite +* not being marked with the paged attribute. If that is the case, +* then treat the sensor as being paged and add the page suffix to the +* attribute name. +* We don't just add the paged attribute to all such attributes, in +* order to maintain the un-suffixed labels in the case where the +* attribute is only on page 0. +*/ +for (p =1 ; p < info->pages; p++) { +if (info->func[p] & attr->func) +return true; + } +return false; +} + static int pmbus_add_sensor_attrs(struct i2c_client *client, struct pmbus_data *data, const char *name,
@@ -1080,14 +1105,15 @@ static int pmbus_add_sensor_attrs(struct i2c_client *client, index =1 ;for (i =0 ; i < nattrs; i++) {int page, pages; +bool paged =pmbus_sensor_is_paged (info, attrs); - pages = attrs->paged ? info->pages :1 ; + pages = paged ? info->pages :1 ;for (page =0 ; page < pages; page++) {if (!(info->func[page] & attrs->func))continue ; ret =pmbus_add_sensor_attrs_one (client, data, info, name, index, page, - attrs); + attrs, paged);if (ret)return ret; index++;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/73 Btrfs: fix race between readahead and device replace/removal
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit ce7791ffee1e1ee9f97193b817c7dd1fa6746aad upstream.
The list of devices is protected by the device_list_mutex and the device replace code, in its finishing phase correctly takes that mutex before removing the source device from that list. However the readahead code was iterating that list without acquiring the respective mutex leading to crashes later on due to invalid memory accesses:
[125671.831036] general protection fault: 0000 [#1] PREEMPT SMP [125671.832129] Modules linked in: btrfs dm_flakey dm_mod crc32c_generic xor raid6_pq acpi_cpufreq tpm_tis tpm ppdev evdev parport_pc psmouse sg parport processor ser [125671.834973] CPU: 10 PID: 19603 Comm: kworker/u32:19 Tainted: G W 4.6.0-rc7-btrfs-next-29+ #1 [125671.834973] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS by qemu-project.org 04/01/2014 [125671.834973] Workqueue: btrfs-readahead btrfs_readahead_helper [btrfs] [125671.834973] task: ffff8801ac520540 ti: ffff8801ac918000 task.ti: ffff8801ac918000 [125671.834973] RIP: 0010:[<ffffffff81270479>] [<ffffffff81270479>] __radix_tree_lookup+0x6a/0x105 [125671.834973] RSP: 0018:ffff8801ac91bc28 EFLAGS: 00010206 [125671.834973] RAX: 0000000000000000 RBX: 6b6b6b6b6b6b6b6a RCX: 0000000000000000 [125671.834973] RDX: 0000000000000000 RSI: 00000000000c1bff RDI: ffff88002ebd62a8 [125671.834973] RBP: ffff8801ac91bc70 R08: 0000000000000001 R09: 0000000000000000 [125671.834973] R10: ffff8801ac91bc70 R11: 0000000000000000 R12: ffff88002ebd62a8 [125671.834973] R13: 0000000000000000 R14: 0000000000000000 R15: 00000000000c1bff [125671.834973] FS: 0000000000000000(0000) GS:ffff88023fd40000(0000) knlGS:0000000000000000 [125671.834973] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [125671.834973] CR2: 000000000073cae4 CR3: 00000000b7723000 CR4: 00000000000006e0 [125671.834973] Stack: [125671.834973] 0000000000000000 ffff8801422d5600 ffff8802286bbc00 0000000000000000 [125671.834973] 0000000000000001 ffff8802286bbc00 00000000000c1bff 0000000000000000 [125671.834973] ffff88002e639eb8 ffff8801ac91bc80 ffffffff81270541 ffff8801ac91bcb0 [125671.834973] Call Trace: [125671.834973] [<ffffffff81270541>] radix_tree_lookup+0xd/0xf [125671.834973] [<ffffffffa04ae6a6>] reada_peer_zones_set_lock+0x3e/0x60 [btrfs] [125671.834973] [<ffffffffa04ae8b9>] reada_pick_zone+0x29/0x103 [btrfs] [125671.834973] [<ffffffffa04af42f>] reada_start_machine_worker+0x129/0x2d3 [btrfs] [125671.834973] [<ffffffffa04880be>] btrfs_scrubparity_helper+0x185/0x3aa [btrfs] [125671.834973] [<ffffffffa0488341>] btrfs_readahead_helper+0xe/0x10 [btrfs] [125671.834973] [<ffffffff81069691>] process_one_work+0x271/0x4e9 [125671.834973] [<ffffffff81069dda>] worker_thread+0x1eb/0x2c9 [125671.834973] [<ffffffff81069bef>] ? rescuer_thread+0x2b3/0x2b3 [125671.834973] [<ffffffff8106f403>] kthread+0xd4/0xdc [125671.834973] [<ffffffff8149e242>] ret_from_fork+0x22/0x40 [125671.834973] [<ffffffff8106f32f>] ? kthread_stop+0x286/0x286
So fix this by taking the device_list_mutex in the readahead code. We can't use here the lighter approach of using a rcu_read_lock() and rcu_read_unlock() pair together with a list_for_each_entry_rcu() call because we end up doing calls to sleeping functions (kzalloc()) in the respective code path.
--- fs/btrfs/reada.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/reada.c +2 -0
@@ -764,12 +764,14 @@ static void __reada_start_machine(structdo { enqueued =0 ; +mutex_lock (&fs_devices->device_list_mutex);list_for_each_entry (device, &fs_devices->devices, dev_list) {if (atomic_read (&device->reada_in_flight) <MAX_IN_FLIGHT ) enqueued +=reada_start_machine_dev (fs_info, device); } +mutex_unlock (&fs_devices->device_list_mutex); total += enqueued; }while (enqueued && total <10000 );
Greg Kroah-Hartman
maintainerPATCH 2/73 mm/page_idle.c: fix oops because end_pfn is larger than max_pfn
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit 7298e3b0a149c91323b3205d325e942c3b3b9ef6 upstream.
Currently the calcuation of end_pfn can round up the pfn number to more than the actual maximum number of pfns, causing an Oops. Fix this by ensuring end_pfn is never more than max_pfn.
This can be easily triggered when on systems where the end_pfn gets rounded up to more than max_pfn using the idle-page stress-ng stress test:
sudo stress-ng --idle-page 0
BUG: unable to handle kernel paging request at 00000000000020d8
#PF error: [normal kernel read fault]
PGD 0 P4D 0
Oops: 0000 [#1] SMP PTI
CPU: 1 PID: 11039 Comm: stress-ng-idle- Not tainted 5.0.0-5-generic #6-Ubuntu
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014
RIP: 0010:page_idle_get_page+0xc8/0x1a0
Code: 0f b1 0a 75 7d 48 8b 03 48 89 c2 48 c1 e8 33 83 e0 07 48 c1 ea 36 48 8d 0c 40 4c 8d 24 88 49 c1 e4 07 4c 03 24 d5 00 89 c3 be <49> 8b 44 24 58 48 8d b8 80 a1 02 00 e8 07 d5 77 00 48 8b 53 08 48
RSP: 0018:ffffafd7c672fde8 EFLAGS: 00010202
RAX: 0000000000000005 RBX: ffffe36341fff700 RCX: 000000000000000f
RDX: 0000000000000284 RSI: 0000000000000275 RDI: 0000000001fff700
RBP: ffffafd7c672fe00 R08: ffffa0bc34056410 R09: 0000000000000276
R10: ffffa0bc754e9b40 R11: ffffa0bc330f6400 R12: 0000000000002080
R13: ffffe36341fff700 R14: 0000000000080000 R15: ffffa0bc330f6400
FS: 00007f0ec1ea5740(0000) GS:ffffa0bc7db00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00000000000020d8 CR3: 0000000077d68000 CR4: 00000000000006e0
Call Trace:
page_idle_bitmap_write+0x8c/0x140
sysfs_kf_bin_write+0x5c/0x70
kernfs_fop_write+0x12e/0x1b0
__vfs_write+0x1b/0x40
vfs_write+0xab/0x1b0
ksys_write+0x55/0xc0
__x64_sys_write+0x1a/0x20
do_syscall_64+0x5a/0x110
entry_SYSCALL_64_after_hwframe+0x44/0xa9--- mm/page_idle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/page_idle.c +2 -2
@@ -130,7 +130,7 @@ static ssize_t page_idle_bitmap_read(str end_pfn = pfn + count *BITS_PER_BYTE ;if (end_pfn > max_pfn) - end_pfn =ALIGN (max_pfn,BITMAP_CHUNK_BITS ); + end_pfn = max_pfn;for (; pfn < end_pfn; pfn++) { bit = pfn %BITMAP_CHUNK_BITS ;
@@ -175,7 +175,7 @@ static ssize_t page_idle_bitmap_write(st end_pfn = pfn + count *BITS_PER_BYTE ;if (end_pfn > max_pfn) - end_pfn =ALIGN (max_pfn,BITMAP_CHUNK_BITS ); + end_pfn = max_pfn;for (; pfn < end_pfn; pfn++) { bit = pfn %BITMAP_CHUNK_BITS ;
Greg Kroah-Hartman
maintainerPATCH 21/73 can: flexcan: fix timeout when set small bitrate
In reply to Greg Kroah-HartmanFrom: Joakim Zhang <[email protected]>
commit 247e5356a709eb49a0d95ff2a7f07dac05c8252c upstream.
Current we can meet timeout issue when setting a small bitrate like 10000 as follows on i.MX6UL EVK board (ipg clock = 66MHZ, per clock = 30MHZ):
| root@imx6ul7d:~# ip link set can0 up type can bitrate 10000
A link change request failed with some changes committed already. Interface can0 may have been left with an inconsistent configuration, please check.
| RTNETLINK answers: Connection timed out
It is caused by calling of flexcan_chip_unfreeze() timeout.
Originally the code is using usleep_range(10, 20) for unfreeze operation, but the patch (8badd65 can: flexcan: avoid calling usleep_range from interrupt context) changed it into udelay(10) which is only a half delay of before, there're also some other delay changes.
After double to FLEXCAN_TIMEOUT_US to 100 can fix the issue.
Meanwhile, Rasmus Villemoes reported that even with a timeout of 100, flexcan_probe() fails on the MPC8309, which requires a value of at least 140 to work reliably. 250 works for everyone.
--- drivers/net/can/flexcan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/flexcan.c +1 -1
@@ -171,7 +171,7 @@#define FLEXCAN_MB_CNT_LENGTH (x) (((x) & 0xf) << 16)#define FLEXCAN_MB_CNT_TIMESTAMP (x) ((x) & 0xffff) -#define FLEXCAN_TIMEOUT_US (50) +#define FLEXCAN_TIMEOUT_US (250)/* FLEXCAN hardware feature flags *
Greg Kroah-Hartman
maintainerPATCH 22/73 can: purge socket error queue on sock destruct
In reply to Greg Kroah-HartmanFrom: Willem de Bruijn <[email protected]>
commit fd704bd5ee749d560e86c4f1fd2ef486d8abf7cf upstream.
CAN supports software tx timestamps as of the below commit. Purge any queued timestamp packets on socket destroy.
--- net/can/af_can.c | 1 + 1 file changed, 1 insertion(+)
net/can/af_can.c +1 -0
@@ -113,6 +113,7 @@ EXPORT_SYMBOL(can_ioctl);static void can_sock_destruct (struct sock *sk) {skb_queue_purge (&sk->sk_receive_queue); +skb_queue_purge (&sk->sk_error_queue); }static const struct can_proto *can_get_proto (int protocol)
Greg Kroah-Hartman
maintainerPATCH 20/73 btrfs: start readahead also in seed devices
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
commit c4e0540d0ad49c8ceab06cceed1de27c4fe29f6e upstream.
Currently, btrfs does not consult seed devices to start readahead. As a result, if readahead zone is added to the seed devices, btrfs_reada_wait() indefinitely wait for the reada_ctl to finish.
You can reproduce the hung by modifying btrfs/163 to have larger initial file size (e.g. xfs_io pwrite 4M instead of current 256K).
--- fs/btrfs/reada.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/btrfs/reada.c +5 -0
@@ -762,6 +762,7 @@ static void __reada_start_machine(structu64 total =0 ;int i; +again: do { enqueued = 0; mutex_lock(&fs_devices->device_list_mutex);
@@ -774,6 +775,10 @@ static void __reada_start_machine(structmutex_unlock (&fs_devices->device_list_mutex); total += enqueued; }while (enqueued && total <10000 ); +if (fs_devices->seed) { + fs_devices = fs_devices->seed; + goto again; + }if (enqueued ==0 )return ;
Greg Kroah-Hartman
maintainerPATCH 24/73 Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
In reply to Greg Kroah-HartmanFrom: Marcel Holtmann <[email protected]>
commit d5bb334a8e171b262e48f378bd2096c0ea458265 upstream.
The minimum encryption key size for LE connections is 56 bits and to align LE with BR/EDR, enforce 56 bits of minimum encryption key size for BR/EDR connections as well.
--- include/net/bluetooth/hci_core.h | 3 +++ net/bluetooth/hci_conn.c | 8 ++++++++ 2 files changed, 11 insertions(+)
include/net/bluetooth/hci_core.h +3 -0
@@ -174,6 +174,9 @@ struct adv_info {#define HCI_MAX_SHORT_NAME_LENGTH 10 +/* Min encryption key size to match with SMP */ +#define HCI_MIN_ENC_KEY_SIZE 7 +/* Default LE RPA expiry time, 15 minutes */ #define HCI_DEFAULT_RPA_TIMEOUT (15 * 60)
net/bluetooth/hci_conn.c +8 -0
@@ -1177,6 +1177,14 @@ int hci_conn_check_link_mode(struct hci_ !test_bit(HCI_CONN_ENCRYPT, &conn->flags))return 0 ; +/* The minimum encryption key size needs to be enforced by the +* host stack before establishing any L2CAP connections. The +* specification in theory allows a minimum of 1, but to align +* BR/EDR and LE transports, a minimum of 7 is chosen. +*/ +if (conn->enc_key_size <HCI_MIN_ENC_KEY_SIZE ) +return 0 ; +return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 25/73 Bluetooth: Fix regression with minimum encryption key size alignment
In reply to Greg Kroah-HartmanFrom: Marcel Holtmann <[email protected]>
commit 693cd8ce3f882524a5d06f7800dd8492411877b3 upstream.
When trying to align the minimum encryption key size requirement for Bluetooth connections, it turns out doing this in a central location in the HCI connection handling code is not possible.
Original Bluetooth version up to 2.0 used a security model where the L2CAP service would enforce authentication and encryption. Starting with Bluetooth 2.1 and Secure Simple Pairing that model has changed into that the connection initiator is responsible for providing an encrypted ACL link before any L2CAP communication can happen.
Now connecting Bluetooth 2.1 or later devices with Bluetooth 2.0 and before devices are causing a regression. The encryption key size check needs to be moved out of the HCI connection handling into the L2CAP channel setup.
To achieve this, the current check inside hci_conn_security() has been moved into l2cap_check_enc_key_size() helper function and then called from four decisions point inside L2CAP to cover all combinations of Secure Simple Pairing enabled devices and device using legacy pairing and legacy service security model.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203643
--- net/bluetooth/hci_conn.c | 18 +++++++++--------- net/bluetooth/l2cap_core.c | 33 ++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 14 deletions(-)
net/bluetooth/hci_conn.c +9 -9
@@ -1177,14 +1177,6 @@ int hci_conn_check_link_mode(struct hci_ !test_bit(HCI_CONN_ENCRYPT, &conn->flags))return 0 ; -/* The minimum encryption key size needs to be enforced by the -* host stack before establishing any L2CAP connections. The -* specification in theory allows a minimum of 1, but to align -* BR/EDR and LE transports, a minimum of 7 is chosen. -*/ -if (conn->enc_key_size <HCI_MIN_ENC_KEY_SIZE ) -return 0 ; -return 1 ; }
@@ -1301,8 +1293,16 @@ auth:return 0 ; encrypt: -if (test_bit (HCI_CONN_ENCRYPT , &conn->flags)) +if (test_bit (HCI_CONN_ENCRYPT , &conn->flags)) { +/* Ensure that the encryption key size has been read, +* otherwise stall the upper layer responses. +*/ +if (!conn->enc_key_size) +return 0 ; + +/* Nothing else needed, all requirements are met */ return 1 ; + }hci_conn_encrypt (conn);return 0 ;
net/bluetooth/l2cap_core.c +28 -5
@@ -1329,6 +1329,21 @@ static void l2cap_request_info(struct l2 sizeof(req), &req); } +static bool l2cap_check_enc_key_size (struct hci_conn *hcon) +{ +/* The minimum encryption key size needs to be enforced by the +* host stack before establishing any L2CAP connections. The +* specification in theory allows a minimum of 1, but to align +* BR/EDR and LE transports, a minimum of 7 is chosen. +* +* This check might also be called for unencrypted connections +* that have no key size requirements. Ensure that the link is +* actually encrypted before enforcing a key size. +*/ +return (!test_bit (HCI_CONN_ENCRYPT , &hcon->flags) || + hcon->enc_key_size >HCI_MIN_ENC_KEY_SIZE ); +} +static void l2cap_do_start (struct l2cap_chan *chan) {struct l2cap_conn *conn = chan->conn;
@@ -1346,9 +1361,14 @@ static void l2cap_do_start(struct l2cap_if (!(conn->info_state &L2CAP_INFO_FEAT_MASK_REQ_DONE ))return ; -if (l2cap_chan_check_security (chan, true) && -__l2cap_no_conn_pending (chan)) +if (!l2cap_chan_check_security (chan, true) || + !__l2cap_no_conn_pending (chan)) +return ; + +if (l2cap_check_enc_key_size (conn->hcon))l2cap_start_connection (chan); +else +__set_chan_timer (chan,L2CAP_DISC_TIMEOUT ); }static inline int l2cap_mode_supported (__u8 mode,__u32 feat_mask)
@@ -1427,7 +1447,10 @@ static void l2cap_conn_start(struct l2cacontinue ; } -l2cap_start_connection (chan); +if (l2cap_check_enc_key_size (conn->hcon)) +l2cap_start_connection (chan); +else +l2cap_chan_close (chan,ECONNREFUSED ); }else if (chan->state ==BT_CONNECT2 ) {struct l2cap_conn_rsp rsp;
@@ -7432,7 +7455,7 @@ static void l2cap_security_cfm(struct hc }if (chan->state ==BT_CONNECT ) { -if (!status) +if (!status &&l2cap_check_enc_key_size (hcon))l2cap_start_connection (chan);else __set_chan_timer (chan,L2CAP_DISC_TIMEOUT );
@@ -7441,7 +7464,7 @@ static void l2cap_security_cfm(struct hcstruct l2cap_conn_rsp rsp;__u16 res, stat; -if (!status) { +if (!status &&l2cap_check_enc_key_size (hcon)) {if (test_bit (FLAG_DEFER_SETUP , &chan->flags)) { res =L2CAP_CR_PEND ; stat =L2CAP_CS_AUTHOR_PEND ;
Greg Kroah-Hartman
maintainerPATCH 3/73 scsi: vmw_pscsi: Fix use-after-free in pvscsi_queue_lck()
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 240b4cc8fd5db138b675297d4226ec46594d9b3b upstream.
Once we unlock adapter->hw_lock in pvscsi_queue_lck() nothing prevents just queued scsi_cmnd from completing and freeing the request. Thus cmd->cmnd[0] dereference can dereference already freed request leading to kernel crashes or other issues (which one of our customers observed). Store cmd->cmnd[0] in a local variable before unlocking adapter->hw_lock to fix the issue.
--- drivers/scsi/vmw_pvscsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/vmw_pvscsi.c +4 -2
@@ -733,6 +733,7 @@ static int pvscsi_queue_lck(struct scsi_struct pvscsi_adapter *adapter =shost_priv (host);struct pvscsi_ctx *ctx;unsigned long flags; +unsigned char op;spin_lock_irqsave (&adapter->hw_lock, flags);
@@ -745,13 +746,14 @@ static int pvscsi_queue_lck(struct scsi_ } cmd->scsi_done = done; + op = cmd->cmnd[0 ];dev_dbg (&cmd->device->sdev_gendev, -"queued cmd %p, ctx %p, op=%x\n" , cmd, ctx, cmd->cmnd[0 ]); +"queued cmd %p, ctx %p, op=%x\n" , cmd, ctx, op);spin_unlock_irqrestore (&adapter->hw_lock, flags); -pvscsi_kick_io (adapter, cmd->cmnd[0 ]); +pvscsi_kick_io (adapter, op);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 4/73 tracing: Silence GCC 9 array bounds warning
In reply to Greg Kroah-HartmanFrom: Miguel Ojeda <[email protected]>
commit 0c97bf863efce63d6ab7971dad811601e6171d2f upstream.
Starting with GCC 9, -Warray-bounds detects cases when memset is called starting on a member of a struct but the size to be cleared ends up writing over further members.
Such a call happens in the trace code to clear, at once, all members after and including seq on struct trace_iterator:
In function 'memset',
inlined from 'ftrace_dump' at kernel/trace/trace.c:8914:3:
./include/linux/string.h:344:9: warning: '__builtin_memset' offset [8505, 8560] from the object at 'iter' is out of the bounds of referenced subobject 'seq' with type 'struct trace_seq' at offset 4368 [-Warray-bounds]
344 | return __builtin_memset(p, c, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In order to avoid GCC complaining about it, we compute the address ourselves by adding the offsetof distance instead of referring directly to the member.
Since there are two places doing this clear (trace.c and trace_kdb.c), take the chance to move the workaround into a single place in the internal header.
--- kernel/trace/trace.c | 6 +----- kernel/trace/trace.h | 18 ++++++++++++++++++ kernel/trace/trace_kdb.c | 6 +----- 3 files changed, 20 insertions(+), 10 deletions(-)
kernel/trace/trace.c +1 -5
@@ -7189,12 +7189,8 @@ void ftrace_dump(enum ftrace_dump_mode o cnt++; -/* reset all but tr, trace, and overruns */ -memset (&iter.seq,0 , -sizeof (struct trace_iterator ) - - offsetof(struct trace_iterator , seq)); +trace_iterator_reset (&iter); iter.iter_flags |=TRACE_FILE_LAT_FMT ; - iter.pos =-1 ;if (trace_find_next_entry_inc (&iter) !=NULL ) {int ret;
kernel/trace/trace.h +18 -0
@@ -1381,4 +1381,22 @@ static inline void trace_event_enum_updaextern struct trace_iterator *tracepoint_print_iter; +/* +* Reset the state of the trace_iterator so that it can read consumed data. +* Normally, the trace_iterator is used for reading the data when it is not +* consumed, and must retain state. +*/ +static __always_inline void trace_iterator_reset(struct trace_iterator *iter) +{ +const size_t offset = offsetof(struct trace_iterator , seq); + +/* +* Keep gcc from complaining about overwriting more than just one +* member in the structure. +*/ +memset ((char *)iter + offset,0 ,sizeof (struct trace_iterator ) - offset); + + iter->pos =-1 ; +} +#endif /* _LINUX_KERNEL_TRACE_H */
kernel/trace/trace_kdb.c +1 -5
@@ -40,12 +40,8 @@ static void ftrace_dump_buf(int skip_linkdb_printf ("Dumping ftrace buffer:\n" ); -/* reset all but tr, trace, and overruns */ -memset (&iter.seq,0 , -sizeof (struct trace_iterator ) - - offsetof(struct trace_iterator , seq)); +trace_iterator_reset (&iter); iter.iter_flags |=TRACE_FILE_LAT_FMT ; - iter.pos =-1 ;if (cpu_file ==RING_BUFFER_ALL_CPUS ) {for_each_tracing_cpu (cpu) {
Greg Kroah-Hartman
maintainerPATCH 6/73 usb: chipidea: udc: workaround for endpoint conflict issue
In reply to Greg Kroah-HartmanFrom: Peter Chen <[email protected]>
commit c19dffc0a9511a7d7493ec21019aefd97e9a111b upstream.
An endpoint conflict occurs when the USB is working in device mode during an isochronous communication. When the endpointA IN direction is an isochronous IN endpoint, and the host sends an IN token to endpointA on another device, then the OUT transaction may be missed regardless the OUT endpoint number. Generally, this occurs when the device is connected to the host through a hub and other devices are connected to the same hub.
The affected OUT endpoint can be either control, bulk, isochronous, or an interrupt endpoint. After the OUT endpoint is primed, if an IN token to the same endpoint number on another device is received, then the OUT endpoint may be unprimed (cannot be detected by software), which causes this endpoint to no longer respond to the host OUT token, and thus, no corresponding interrupt occurs.
There is no good workaround for this issue, the only thing the software could do is numbering isochronous IN from the highest endpoint since we have observed most of device number endpoint from the lowest.
--- drivers/usb/chipidea/udc.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/usb/chipidea/udc.c +20 -0
@@ -1614,6 +1614,25 @@ static int ci_udc_pullup(struct usb_gadgstatic int ci_udc_start (struct usb_gadget *gadget,struct usb_gadget_driver *driver);static int ci_udc_stop (struct usb_gadget *gadget); + +/* Match ISOC IN from the highest endpoint */ +static struct usb_ep *ci_udc_match_ep (struct usb_gadget *gadget, +struct usb_endpoint_descriptor *desc, +struct usb_ss_ep_comp_descriptor *comp_desc) +{ + struct ci_hdrc *ci = container_of(gadget, struct ci_hdrc, gadget); +struct usb_ep *ep; + +if (usb_endpoint_xfer_isoc (desc) &&usb_endpoint_dir_in (desc)) { +list_for_each_entry_reverse (ep, &ci->gadget.ep_list, ep_list) { +if (ep->caps.dir_in && !ep->claimed) +return ep; + } + } + +return NULL ; +} +/** * Device operations part of the API to the USB controller hardware, * which don't involve endpoints (or i/o)
@@ -1627,6 +1646,7 @@ static const struct usb_gadget_ops usb_g .vbus_draw = ci_udc_vbus_draw, .udc_start = ci_udc_start, .udc_stop = ci_udc_stop, + .match_ep = ci_udc_match_ep, };static int init_eps (struct ci_hdrc *ci)
Greg Kroah-Hartman
maintainerPATCH 8/73 apparmor: enforce nullbyte at end of tag string
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit 8404d7a674c49278607d19726e0acc0cae299357 upstream.
A packed AppArmor policy contains null-terminated tag strings that are read by unpack_nameX(). However, unpack_nameX() uses string functions on them without ensuring that they are actually null-terminated, potentially leading to out-of-bounds accesses.
Make sure that the tag string is null-terminated before passing it to strcmp().
--- security/apparmor/policy_unpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/apparmor/policy_unpack.c +1 -1
@@ -177,7 +177,7 @@ static bool unpack_nameX(struct aa_ext *char *tag =NULL ;size_t size =unpack_u16_chunk (e, &tag);/* if a name is specified it must match. otherwise skip tag */ -if (name && (!size ||strcmp (name, tag))) +if (name && (!size || tag[size-1 ] !='\0' ||strcmp (name, tag))) goto fail; }else if (name) {/* if a name is specified and there is no name tag fail */
Greg Kroah-Hartman
maintainerPATCH 9/73 parport: Fix mem leak in parport_register_dev_model
In reply to Greg Kroah-Hartman[ Upstream commit 1c7ebeabc9e5ee12e42075a597de40fdb9059530 ]
BUG: memory leak
unreferenced object 0xffff8881df48cda0 (size 16):
comm "syz-executor.0", pid 5077, jiffies 4295994670 (age 22.280s)
hex dump (first 16 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000d2d0d5fe>] parport_register_dev_model+0x141/0x6e0 [parport]
[<00000000782f6dab>] 0xffffffffc15d1196
[<00000000d2ca6ae4>] platform_drv_probe+0x7e/0x100
[<00000000628c2a94>] really_probe+0x342/0x4d0
[<000000006874f5da>] driver_probe_device+0x8c/0x170
[<00000000424de37a>] __device_attach_driver+0xda/0x100
[<000000002acab09a>] bus_for_each_drv+0xfe/0x170
[<000000003d9e5f31>] __device_attach+0x190/0x230
[<0000000035d32f80>] bus_probe_device+0x123/0x140
[<00000000a05ba627>] device_add+0x7cc/0xce0
[<000000003f7560bf>] platform_device_add+0x230/0x3c0
[<000000002a0be07d>] 0xffffffffc15d0949
[<000000007361d8d2>] port_check+0x3b/0x50 [parport]
[<000000004d67200f>] bus_for_each_dev+0x115/0x180
[<000000003ccfd11c>] __parport_register_driver+0x1f0/0x210 [parport]
[<00000000987f06fc>] 0xffffffffc15d803eAfter commit 4e5a74f1db8d ("parport: Revert "parport: fix memory leak""), free_pardevice do not free par_dev->state, we should free it in error path of parport_register_dev_model before return.
--- drivers/parport/share.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/parport/share.c +2 -0
@@ -892,6 +892,7 @@ parport_register_dev_model(struct parport *port, const char *name, par_dev->devmodel = true; ret =device_register (&par_dev->dev);if (ret) { +kfree (par_dev->state);put_device (&par_dev->dev); goto err_put_port; }
@@ -909,6 +910,7 @@ parport_register_dev_model(struct parport *port, const char *name,spin_unlock (&port->physport->pardevice_lock);pr_debug ("%s: cannot grant exclusive access for device %s\n" , port->name, name); +kfree (par_dev->state);device_unregister (&par_dev->dev); goto err_put_port; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainercover 4.4.185-stable review
This is the start of the stable review cycle for the 4.4.185 release. There are 73 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 Wed 10 Jul 2019 03:03:52 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.185-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.185-rc1
Robin Gong <[email protected]>
dmaengine: imx-sdma: remove BD_INTR for channel0
Paolo Bonzini <[email protected]>
KVM: x86: degrade WARN to pr_warn_ratelimited
Kees Cook <[email protected]>
arm64, vdso: Define vdso_{start,end} as array
Vineet Gupta <[email protected]>
ARC: handle gcc generated __builtin_trap for older compiler
Linus Torvalds <[email protected]>
tty: rocket: fix incorrect forward declaration of 'rp_init()'
Nikolay Borisov <[email protected]>
btrfs: Ensure replaced device doesn't have pending chunk allocation
Herbert Xu <[email protected]>
lib/mpi: Fix karactx leak in mpi_powm
Colin Ian King <[email protected]>
ALSA: usb-audio: fix sign unintended sign extension on left shifts
Takashi Sakamoto <[email protected]>
ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages
Colin Ian King <[email protected]>
ALSA: seq: fix incorrect order of dest_client/dest_ports arguments
Eric Biggers <[email protected]>
crypto: user - prevent operating on larval algorithms
Jann Horn <[email protected]>
ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME
Paul Burton <[email protected]>
MIPS: Workaround GCC __builtin_unreachable reordering bug
Arnd Bergmann <[email protected]>
bug.h: work around GCC PR82365 in BUG()
Thierry Reding <[email protected]>
swiotlb: Make linux/swiotlb.h standalone includible
Arnd Bergmann <[email protected]>
mfd: omap-usb-tll: Fix register offsets
Manuel Lauss <[email protected]>
MIPS: math-emu: do not use bools for arithmetic
Vineet Gupta <[email protected]>
ARC: fix build warning in elf.h
Vineet Gupta <[email protected]>
ARC: Assume multiplier is always present
Don Brace <[email protected]>
scsi: hpsa: correct ioaccel2 chaining
Alexandre Belloni <[email protected]>
usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
Young Xiao <[email protected]>
usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i]
Yu-Hsuan Hsu <[email protected]>
ASoC: max98090: remove 24-bit format support if RJ is 0
YueHaibing <[email protected]>
spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
Matt Flax <[email protected]>
ASoC : cs4265 : readable register too low
Jason A. Donenfeld <[email protected]>
um: Compile with modern headers
Matias Karhumaa <[email protected]>
Bluetooth: Fix faulty expression for minimum encryption key size check
Josh Elsasser <[email protected]>
net: check before dereferencing netdev_ops during busy poll
YueHaibing <[email protected]>
bonding: Always enable vlan tx offload
Stephen Suryaputra <[email protected]>
ipv4: Use return value of inet_iif() for __raw_v4_lookup in the while loop
YueHaibing <[email protected]>
team: Always enable vlan tx offload
Xin Long <[email protected]>
tipc: check msg->req data len in tipc_nl_compat_bearer_disable
Xin Long <[email protected]>
tipc: change to use register_pernet_device
Xin Long <[email protected]>
sctp: change to hold sk after auth shkey is created successfully
Geert Uytterhoeven <[email protected]>
cpu/speculation: Warn on unsupported mitigations= parameter
Alejandro Jimenez <[email protected]>
x86/speculation: Allow guests to use SSBD even if host does not
Vivek Goyal <[email protected]>
ovl: modify ovl_permission() to do checks on two inodes
Wanpeng Li <[email protected]>
KVM: X86: Fix scan ioapic use-before-initialization
Adeodato Simó <[email protected]>
net/9p: include trans_common.h to fix missing prototype warning.
Dominique Martinet <[email protected]>
9p: p9dirent_read: check network-provided name length
Dominique Martinet <[email protected]>
9p/rdma: remove useless check in cm_event_handler
Dominique Martinet <[email protected]>
9p: acl: fix uninitialized iattr access
Dominique Martinet <[email protected]>
9p/rdma: do not disconnect on down_interruptible EAGAIN
Arnaldo Carvalho de Melo <[email protected]>
perf help: Remove needless use of strncpy()
Arnaldo Carvalho de Melo <[email protected]>
perf ui helpline: Use strlcpy() as a shorter form of strncpy() + explicit set nul
Johannes Berg <[email protected]>
mac80211: drop robust management frames from unknown TA
Eric Biggers <[email protected]>
cfg80211: fix memory leak of wiphy device name
Steve French <[email protected]>
SMB3: retry on STATUS_INSUFFICIENT_RESOURCES instead of failing write
Marcel Holtmann <[email protected]>
Bluetooth: Fix regression with minimum encryption key size alignment
Marcel Holtmann <[email protected]>
Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
Fabio Estevam <[email protected]>
ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX
Willem de Bruijn <[email protected]>
can: purge socket error queue on sock destruct
Joakim Zhang <[email protected]>
can: flexcan: fix timeout when set small bitrate
Naohiro Aota <[email protected]>
btrfs: start readahead also in seed devices
Filipe Manana <[email protected]>
Btrfs: fix race between readahead and device replace/removal
Robert Hancock <[email protected]>
hwmon: (pmbus/core) Treat parameters as paged if on multiple pages
Alexandra Winter <[email protected]>
s390/qeth: fix VLAN attribute in bridge_hostnotify udev event
Avri Altman <[email protected]>
scsi: ufs: Check that space was properly alloced in copy_query_response
George G. Davis <[email protected]>
scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
Young Xiao <[email protected]>
sparc: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD
Yonglong Liu <[email protected]>
net: hns: Fix loopback test failed at copper ports
YueHaibing <[email protected]>
MIPS: uprobes: remove set but not used variable 'epc'
Mike Marciniszyn <[email protected]>
IB/hfi1: Insure freeze_work work_struct is canceled on shutdown
Helge Deller <[email protected]>
parisc: Fix compiler warnings in float emulation code
YueHaibing <[email protected]>
parport: Fix mem leak in parport_register_dev_model
Jann Horn <[email protected]>
apparmor: enforce nullbyte at end of tag string
Andrey Smirnov <[email protected]>
Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD
Peter Chen <[email protected]>
usb: chipidea: udc: workaround for endpoint conflict issue
Linus Torvalds <[email protected]>
gcc-9: silence 'address-of-packed-member' warning
Miguel Ojeda <[email protected]>
tracing: Silence GCC 9 array bounds warning
Jan Kara <[email protected]>
scsi: vmw_pscsi: Fix use-after-free in pvscsi_queue_lck()
Colin Ian King <[email protected]>
mm/page_idle.c: fix oops because end_pfn is larger than max_pfn
Jann Horn <[email protected]>
fs/binfmt_flat.c: make load_flat_shared_library() work
-------------
Diffstat:
Makefile | 6 ++-- arch/arc/Kconfig | 8 ------ arch/arc/Makefile | 4 --- arch/arc/include/asm/bug.h | 3 +- arch/arc/include/asm/elf.h | 2 +- arch/arc/kernel/setup.c | 2 -- arch/arc/kernel/traps.c | 8 ++++++ arch/arm/mach-imx/cpuidle-imx6sx.c | 3 +- arch/arm64/kernel/vdso.c | 10 +++---- arch/ia64/include/asm/bug.h | 6 +++- arch/m68k/include/asm/bug.h | 3 ++ arch/mips/Kconfig | 1 + arch/mips/include/asm/compiler.h | 35 ++++++++++++++++++++++++ arch/mips/kernel/uprobes.c | 3 -- arch/mips/math-emu/cp1emu.c | 4 +-- arch/parisc/math-emu/cnv_float.h | 8 +++--- arch/sparc/include/asm/bug.h | 6 +++- arch/sparc/kernel/perf_event.c | 4 +++ arch/um/os-Linux/file.c | 1 + arch/um/os-Linux/signal.c | 2 ++ arch/x86/kernel/cpu/bugs.c | 11 +++++++- arch/x86/kvm/x86.c | 9 +++--- arch/x86/um/stub_segv.c | 1 + crypto/crypto_user.c | 3 ++ drivers/dma/imx-sdma.c | 4 +-- drivers/hwmon/pmbus/pmbus_core.c | 34 ++++++++++++++++++++--- drivers/input/misc/uinput.c | 22 +++++++++++++-- drivers/mfd/omap-usb-tll.c | 4 +-- drivers/net/bonding/bond_main.c | 2 +- drivers/net/can/flexcan.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 +++ drivers/net/team/team.c | 2 +- drivers/parport/share.c | 2 ++ drivers/s390/net/qeth_l2_main.c | 2 +- drivers/scsi/hpsa.c | 7 ++++- drivers/scsi/hpsa_cmd.h | 1 + drivers/scsi/ufs/ufshcd.c | 3 +- drivers/scsi/vmw_pvscsi.c | 6 ++-- drivers/spi/spi-bitbang.c | 2 +- drivers/staging/rdma/hfi1/chip.c | 1 + drivers/tty/rocket.c | 2 +- drivers/usb/chipidea/udc.c | 20 ++++++++++++++ drivers/usb/gadget/udc/fusb300_udc.c | 5 ++++ drivers/usb/gadget/udc/lpc32xx_udc.c | 3 +- fs/9p/acl.c | 2 +- fs/binfmt_flat.c | 24 +++++----------- fs/btrfs/dev-replace.c | 29 +++++++++++++------- fs/btrfs/reada.c | 7 +++++ fs/btrfs/volumes.c | 2 ++ fs/btrfs/volumes.h | 5 ++++ fs/cifs/smb2maperror.c | 2 +- fs/overlayfs/inode.c | 13 +++++++++ include/asm-generic/bug.h | 1 + include/linux/compiler-gcc.h | 15 +++++++++- include/linux/compiler.h | 5 ++++ include/linux/swiotlb.h | 3 ++ include/net/bluetooth/hci_core.h | 3 ++ include/net/busy_poll.h | 2 +- kernel/cpu.c | 3 ++ kernel/ptrace.c | 4 +-- kernel/trace/trace.c | 6 +--- kernel/trace/trace.h | 18 ++++++++++++ kernel/trace/trace_kdb.c | 6 +--- lib/mpi/mpi-pow.c | 6 ++-- mm/page_idle.c | 4 +-- net/9p/protocol.c | 12 ++++++-- net/9p/trans_common.c | 1 + net/9p/trans_rdma.c | 7 ++--- net/bluetooth/hci_conn.c | 10 ++++++- net/bluetooth/l2cap_core.c | 33 ++++++++++++++++++---- net/can/af_can.c | 1 + net/ipv4/raw.c | 2 +- net/mac80211/rx.c | 2 ++ net/sctp/endpointola.c | 8 +++--- net/tipc/core.c | 12 ++++---- net/tipc/netlink_compat.c | 18 ++++++++++-- net/wireless/core.c | 2 +- scripts/checkstack.pl | 2 +- security/apparmor/policy_unpack.c | 2 +- sound/core/seq/oss/seq_oss_ioctl.c | 2 +- sound/core/seq/oss/seq_oss_rw.c | 2 +- sound/firewire/amdtp-am824.c | 2 +- sound/soc/codecs/cs4265.c | 2 +- sound/soc/codecs/max98090.c | 16 +++++++++++ sound/usb/mixer_quirks.c | 4 +-- tools/perf/builtin-help.c | 2 +- tools/perf/ui/tui/helpline.c | 2 +- 87 files changed, 424 insertions(+), 151 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 27/73 cfg80211: fix memory leak of wiphy device name
From: Eric Biggers <[email protected]>
commit 4f488fbca2a86cc7714a128952eead92cac279ab upstream.
In wiphy_new_nm(), if an error occurs after dev_set_name() and device_initialize() have already been called, it's necessary to call put_device() (via wiphy_free()) to avoid a memory leak.
--- net/wireless/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/wireless/core.c +1 -1
@@ -447,7 +447,7 @@ use_default_name: &rdev->rfkill_ops, rdev);if (!rdev->rfkill) { -kfree (rdev); +wiphy_free (&rdev->wiphy);return NULL ; }
Greg Kroah-Hartman
maintainerPATCH 36/73 KVM: X86: Fix scan ioapic use-before-initialization
In reply to Greg Kroah-HartmanFrom: Wanpeng Li <[email protected]>
commit e97f852fd4561e77721bb9a4e0ea9d98305b1e93 upstream.
Reported by syzkaller:
BUG: unable to handle kernel NULL pointer dereference at 00000000000001c8 PGD 80000003ec4da067 P4D 80000003ec4da067 PUD 3f7bfa067 PMD 0 Oops: 0000 [#1] PREEMPT SMP PTI CPU: 7 PID: 5059 Comm: debug Tainted: G OE 4.19.0-rc5 #16 RIP: 0010:__lock_acquire+0x1a6/0x1990 Call Trace: lock_acquire+0xdb/0x210 _raw_spin_lock+0x38/0x70 kvm_ioapic_scan_entry+0x3e/0x110 [kvm] vcpu_enter_guest+0x167e/0x1910 [kvm] kvm_arch_vcpu_ioctl_run+0x35c/0x610 [kvm] kvm_vcpu_ioctl+0x3e9/0x6d0 [kvm] do_vfs_ioctl+0xa5/0x690 ksys_ioctl+0x6d/0x80 __x64_sys_ioctl+0x1a/0x20 do_syscall_64+0x83/0x6e0 entry_SYSCALL_64_after_hwframe+0x49/0xbe
The reason is that the testcase writes hyperv synic HV_X64_MSR_SINT6 msr and triggers scan ioapic logic to load synic vectors into EOI exit bitmap. However, irqchip is not initialized by this simple testcase, ioapic/apic objects should not be accessed.
This can be triggered by the following program:
#define _GNU_SOURCE
#include <endian.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/syscall.h>
#include <sys/types.h>
#include <unistd.h>
uint64_t r[3] = {0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff};
int main(void)
{
syscall(__NR_mmap, 0x20000000, 0x1000000, 3, 0x32, -1, 0);
long res = 0;
memcpy((void*)0x20000040, "/dev/kvm", 9);
res = syscall(__NR_openat, 0xffffffffffffff9c, 0x20000040, 0, 0);
if (res != -1)
r[0] = res;
res = syscall(__NR_ioctl, r[0], 0xae01, 0);
if (res != -1)
r[1] = res;
res = syscall(__NR_ioctl, r[1], 0xae41, 0);
if (res != -1)
r[2] = res;
memcpy(
(void*)0x20000080,
"\x01\x00\x00\x00\x00\x5b\x61\xbb\x96\x00\x00\x40\x00\x00\x00\x00\x01\x00"
"\x08\x00\x00\x00\x00\x00\x0b\x77\xd1\x78\x4d\xd8\x3a\xed\xb1\x5c\x2e\x43"
"\xaa\x43\x39\xd6\xff\xf5\xf0\xa8\x98\xf2\x3e\x37\x29\x89\xde\x88\xc6\x33"
"\xfc\x2a\xdb\xb7\xe1\x4c\xac\x28\x61\x7b\x9c\xa9\xbc\x0d\xa0\x63\xfe\xfe"
"\xe8\x75\xde\xdd\x19\x38\xdc\x34\xf5\xec\x05\xfd\xeb\x5d\xed\x2e\xaf\x22"
"\xfa\xab\xb7\xe4\x42\x67\xd0\xaf\x06\x1c\x6a\x35\x67\x10\x55\xcb",
106);
syscall(__NR_ioctl, r[2], 0x4008ae89, 0x20000080);
syscall(__NR_ioctl, r[2], 0xae80, 0);
return 0;
}This patch fixes it by bailing out scan ioapic if ioapic is not initialized in kernel.
--- arch/x86/kvm/x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +2 -1
@@ -6409,7 +6409,8 @@ static void vcpu_scan_ioapic(struct kvm_kvm_scan_ioapic_routes (vcpu, vcpu->arch.eoi_exit_bitmap); else { kvm_x86_ops->sync_pir_to_irr (vcpu); -kvm_ioapic_scan_entry (vcpu, vcpu->arch.eoi_exit_bitmap); +if (ioapic_in_kernel (vcpu->kvm)) +kvm_ioapic_scan_entry (vcpu, vcpu->arch.eoi_exit_bitmap); } kvm_x86_ops->load_eoi_exitmap (vcpu); }
Greg Kroah-Hartman
maintainerPATCH 37/73 ovl: modify ovl_permission() to do checks on two inodes
In reply to Greg Kroah-HartmanFrom: Vivek Goyal <[email protected]>
commit c0ca3d70e8d3cf81e2255a217f7ca402f5ed0862 upstream.
Right now ovl_permission() calls __inode_permission(realinode), to do permission checks on real inode and no checks are done on overlay inode.
Modify it to do checks both on overlay inode as well as underlying inode. Checks on overlay inode will be done with the creds of calling task while checks on underlying inode will be done with the creds of mounter.
[ Srivatsa: 4.4.y backport:
- Skipped the hunk modifying non-existent function ovl_get_acl()
- Adjusted the error path
- Included linux/cred.h to get prototype for revert_creds() ]
--- fs/overlayfs/inode.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
fs/overlayfs/inode.c +13 -0
@@ -9,6 +9,7 @@#include <linux/fs.h> #include <linux/slab.h> +#include <linux/cred.h> #include <linux/xattr.h> #include "overlayfs.h"
@@ -91,6 +92,7 @@ int ovl_permission(struct inode *inode,struct ovl_entry *oe;struct dentry *alias =NULL ;struct inode *realinode; +const struct cred *old_cred;struct dentry *realdentry;bool is_upper;int err;
@@ -143,7 +145,18 @@ int ovl_permission(struct inode *inode, goto out_dput; } +/* +* Check overlay inode with the creds of task and underlying inode +* with creds of mounter +*/ + err =generic_permission (inode, mask); +if (err) + goto out_dput; + + old_cred =ovl_override_creds (inode->i_sb); err =__inode_permission (realinode, mask); +revert_creds (old_cred); + out_dput:dput (alias);return err;
Greg Kroah-Hartman
maintainerPATCH 39/73 cpu/speculation: Warn on unsupported mitigations= parameter
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
commit 1bf72720281770162c87990697eae1ba2f1d917a upstream.
Currently, if the user specifies an unsupported mitigation strategy on the kernel command line, it will be ignored silently. The code will fall back to the default strategy, possibly leaving the system more vulnerable than expected.
This may happen due to e.g. a simple typo, or, for a stable kernel release, because not all mitigation strategies have been backported.
Inform the user by printing a message.
--- kernel/cpu.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/cpu.c +3 -0
@@ -851,6 +851,9 @@ static int __init mitigations_parse_cmdl cpu_mitigations =CPU_MITIGATIONS_OFF ; else if (!strcmp(arg, "auto")) cpu_mitigations =CPU_MITIGATIONS_AUTO ; + else + pr_crit("Unsupported mitigations=%s, system may still be vulnerable\n", + arg);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 38/73 x86/speculation: Allow guests to use SSBD even if host does not
In reply to Greg Kroah-HartmanFrom: Alejandro Jimenez <[email protected]>
commit c1f7fec1eb6a2c86d01bc22afce772c743451d88 upstream.
The bits set in x86_spec_ctrl_mask are used to calculate the guest's value of SPEC_CTRL that is written to the MSR before VMENTRY, and control which mitigations the guest can enable. In the case of SSBD, unless the host has enabled SSBD always on mode (by passing "spec_store_bypass_disable=on" in the kernel parameters), the SSBD bit is not set in the mask and the guest can not properly enable the SSBD always on mitigation mode.
This has been confirmed by running the SSBD PoC on a guest using the SSBD always on mitigation mode (booted with kernel parameter "spec_store_bypass_disable=on"), and verifying that the guest is vulnerable unless the host is also using SSBD always on mode. In addition, the guest OS incorrectly reports the SSB vulnerability as mitigated.
Always set the SSBD bit in x86_spec_ctrl_mask when the host CPU supports it, allowing the guest to use SSBD whether or not the host has chosen to enable the mitigation in any of its modes.
--- arch/x86/kernel/cpu/bugs.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/bugs.c +10 -1
@@ -807,6 +807,16 @@ static enum ssb_mitigation __init __ssb_ }/* +* If SSBD is controlled by the SPEC_CTRL MSR, then set the proper +* bit in the mask to allow guests to use the mitigation even in the +* case where the host does not enable it. +*/ +if (static_cpu_has (X86_FEATURE_SPEC_CTRL_SSBD ) || +static_cpu_has (X86_FEATURE_AMD_SSBD )) { + x86_spec_ctrl_mask |=SPEC_CTRL_SSBD ; + } + +/* * We have three CPU feature flags that are in play here: * - X86_BUG_SPEC_STORE_BYPASS - CPU is susceptible. * - X86_FEATURE_SSBD - CPU is able to turn off speculative store bypass
@@ -823,7 +833,6 @@ static enum ssb_mitigation __init __ssb_x86_amd_ssb_disable (); }else { x86_spec_ctrl_base |=SPEC_CTRL_SSBD ; - x86_spec_ctrl_mask |=SPEC_CTRL_SSBD ;wrmsrl (MSR_IA32_SPEC_CTRL , x86_spec_ctrl_base); } }
Greg Kroah-Hartman
maintainerPATCH 41/73 tipc: change to use register_pernet_device
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit c492d4c74dd3f87559883ffa0f94a8f1ae3fe5f5 ]
This patch is to fix a dst defcnt leak, which can be reproduced by doing:
# ip net a c; ip net a s; modprobe tipc # ip net e s ip l a n eth1 type veth peer n eth1 netns c # ip net e c ip l s lo up; ip net e c ip l s eth1 up # ip net e s ip l s lo up; ip net e s ip l s eth1 up # ip net e c ip a a 1.1.1.2/8 dev eth1 # ip net e s ip a a 1.1.1.1/8 dev eth1 # ip net e c tipc b e m udp n u1 localip 1.1.1.2 # ip net e s tipc b e m udp n u1 localip 1.1.1.1 # ip net d c; ip net d s; rmmod tipc
and it will get stuck and keep logging the error:
unregister_netdevice: waiting for lo to become free. Usage count = 1
The cause is that a dst is held by the udp sock's sk_rx_dst set on udp rx path with udp_early_demux == 1, and this dst (eventually holding lo dev) can't be released as bearer's removal in tipc pernet .exit happens after lo dev's removal, default_device pernet .exit.
"There are two distinct types of pernet_operations recognized: subsys and
device. At creation all subsys init functions are called before device init functions, and at destruction all device exit functions are called before subsys exit function."
So by calling register_pernet_device instead to register tipc_net_ops, the pernet .exit() will be invoked earlier than loopback dev's removal when a netns is being destroyed, as fou/gue does.
Note that vxlan and geneve udp tunnels don't have this issue, as the udp sock is released in their device ndo_stop().
This fix is also necessary for tipc dst_cache, which will hold dsts on tx path and I will introduce in my next patch.
--- net/tipc/core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/tipc/core.c +6 -6
@@ -129,7 +129,7 @@ static int __init tipc_init(void)if (err) goto out_sysctl; - err =register_pernet_subsys (&tipc_net_ops); + err =register_pernet_device (&tipc_net_ops);if (err) goto out_pernet;
@@ -137,7 +137,7 @@ static int __init tipc_init(void)if (err) goto out_socket; - err =register_pernet_subsys (&tipc_topsrv_net_ops); + err =register_pernet_device (&tipc_topsrv_net_ops);if (err) goto out_pernet_topsrv;
@@ -148,11 +148,11 @@ static int __init tipc_init(void)pr_info ("Started in single node mode\n" );return 0 ; out_bearer: -unregister_pernet_subsys (&tipc_topsrv_net_ops); +unregister_pernet_device (&tipc_topsrv_net_ops); out_pernet_topsrv:tipc_socket_stop (); out_socket: -unregister_pernet_subsys (&tipc_net_ops); +unregister_pernet_device (&tipc_net_ops); out_pernet:tipc_unregister_sysctl (); out_sysctl:
@@ -167,9 +167,9 @@ out_netlink: static void __exit tipc_exit(void) {tipc_bearer_cleanup (); -unregister_pernet_subsys (&tipc_topsrv_net_ops); +unregister_pernet_device (&tipc_topsrv_net_ops);tipc_socket_stop (); -unregister_pernet_subsys (&tipc_net_ops); +unregister_pernet_device (&tipc_net_ops);tipc_netlink_stop ();tipc_netlink_compat_stop ();tipc_unregister_sysctl ();
Greg Kroah-Hartman
maintainerPATCH 43/73 team: Always enable vlan tx offload
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit ee4297420d56a0033a8593e80b33fcc93fda8509 ]
We should rather have vlan_tci filled all the way down to the transmitting netdevice and let it do the hw/sw vlan implementation.
--- drivers/net/team/team.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/team/team.c +1 -1
@@ -2091,12 +2091,12 @@ static void team_setup(struct net_device dev->features |=NETIF_F_NETNS_LOCAL ; dev->hw_features =TEAM_VLAN_FEATURES | -NETIF_F_HW_VLAN_CTAG_TX |NETIF_F_HW_VLAN_CTAG_RX |NETIF_F_HW_VLAN_CTAG_FILTER ; dev->hw_features &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_HW_CSUM ); dev->features |= dev->hw_features; + dev->features |=NETIF_F_HW_VLAN_CTAG_TX ; } static int team_newlink(struct net *src_net, struct net_device *dev,
Greg Kroah-Hartman
maintainerPATCH 44/73 ipv4: Use return value of inet_iif() for __raw_v4_lookup in the while loop
In reply to Greg Kroah-HartmanFrom: Stephen Suryaputra <[email protected]>
[ Upstream commit 38c73529de13e1e10914de7030b659a2f8b01c3b ]
In commit 19e4e768064a8 ("ipv4: Fix raw socket lookup for local traffic"), the dif argument to __raw_v4_lookup() is coming from the returned value of inet_iif() but the change was done only for the first lookup. Subsequent lookups in the while loop still use skb->dev->ifIndex.
--- net/ipv4/raw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/raw.c +1 -1
@@ -195,7 +195,7 @@ static int raw_v4_input(struct sk_buff * } sk =__raw_v4_lookup (net,sk_next (sk), iph->protocol, iph->saddr, iph->daddr, - skb->dev->ifindex); + dif); } out:read_unlock (&raw_v4_hashinfo.lock);
Greg Kroah-Hartman
maintainerPATCH 45/73 bonding: Always enable vlan tx offload
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 30d8177e8ac776d89d387fad547af6a0f599210e ]
We build vlan on top of bonding interface, which vlan offload is off, bond mode is 802.3ad (LACP) and xmit_hash_policy is BOND_XMIT_POLICY_ENCAP34.
Because vlan tx offload is off, vlan tci is cleared and skb push the vlan header in validate_xmit_vlan() while sending from vlan devices. Then in bond_xmit_hash, __skb_flow_dissect() fails to get information from protocol headers encapsulated within vlan, because 'nhoff' is points to IP header, so bond hashing is based on layer 2 info, which fails to distribute packets across slaves.
This patch always enable bonding's vlan tx offload, pass the vlan packets to the slave devices with vlan tci, let them to handle vlan implementation.
--- drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +1 -1
@@ -4164,13 +4164,13 @@ void bond_setup(struct net_device *bond_ bond_dev->features |=NETIF_F_NETNS_LOCAL ; bond_dev->hw_features =BOND_VLAN_FEATURES | -NETIF_F_HW_VLAN_CTAG_TX |NETIF_F_HW_VLAN_CTAG_RX |NETIF_F_HW_VLAN_CTAG_FILTER ; bond_dev->hw_features &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_HW_CSUM ); bond_dev->hw_features |=NETIF_F_GSO_ENCAP_ALL ; bond_dev->features |= bond_dev->hw_features; + bond_dev->features |=NETIF_F_HW_VLAN_CTAG_TX ; }/* Destroy a bonding device.
Greg Kroah-Hartman
maintainerPATCH 28/73 mac80211: drop robust management frames from unknown TA
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit 588f7d39b3592a36fb7702ae3b8bdd9be4621e2f upstream.
When receiving a robust management frame, drop it if we don't have rx->sta since then we don't have a security association and thus couldn't possibly validate the frame.
--- net/mac80211/rx.c | 2 ++ 1 file changed, 2 insertions(+)
net/mac80211/rx.c +2 -0
@@ -3324,6 +3324,8 @@ static bool ieee80211_accept_frame(struccase NL80211_IFTYPE_STATION :if (!bssid && !sdata->u.mgd.use_4addr)return false; +if (ieee80211_is_robust_mgmt_frame (skb) && !rx->sta) +return false;if (multicast)return true;return ether_addr_equal (sdata->vif.addr, hdr->addr1);
Greg Kroah-Hartman
maintainerPATCH 46/73 net: check before dereferencing netdev_ops during busy poll
In reply to Greg Kroah-HartmanFrom: Josh Elsasser <[email protected]>
init_dummy_netdev() leaves its netdev_ops pointer zeroed. This leads to a NULL pointer dereference when sk_busy_loop fires against an iwlwifi wireless adapter and checks napi->dev->netdev_ops->ndo_busy_poll.
Avoid this by ensuring napi->dev->netdev_ops is valid before following the pointer, avoiding the following panic when busy polling on a dummy netdev:
BUG: unable to handle kernel NULL pointer dereference at 00000000000000c8 IP: [<ffffffff817b4b72>] sk_busy_loop+0x92/0x2f0 Call Trace: [<ffffffff815a3134>] ? uart_write_room+0x74/0xf0 [<ffffffff817964a9>] sock_poll+0x99/0xa0 [<ffffffff81223142>] do_sys_poll+0x2e2/0x520 [<ffffffff8118d3fc>] ? get_page_from_freelist+0x3bc/0xa30 [<ffffffff810ada22>] ? update_curr+0x62/0x140 [<ffffffff811ea671>] ? __slab_free+0xa1/0x2a0 [<ffffffff811ea671>] ? __slab_free+0xa1/0x2a0 [<ffffffff8179dbb1>] ? skb_free_head+0x21/0x30 [<ffffffff81221bd0>] ? poll_initwait+0x50/0x50 [<ffffffff811eaa36>] ? kmem_cache_free+0x1c6/0x1e0 [<ffffffff815a4884>] ? uart_write+0x124/0x1d0 [<ffffffff810bd1cd>] ? remove_wait_queue+0x4d/0x60 [<ffffffff810bd224>] ? __wake_up+0x44/0x50 [<ffffffff81582731>] ? tty_write_unlock+0x31/0x40 [<ffffffff8158c5c6>] ? tty_ldisc_deref+0x16/0x20 [<ffffffff81584820>] ? tty_write+0x1e0/0x2f0 [<ffffffff81587e50>] ? process_echoes+0x80/0x80 [<ffffffff8120c17b>] ? __vfs_write+0x2b/0x130 [<ffffffff8120d09a>] ? vfs_write+0x15a/0x1a0 [<ffffffff81223455>] SyS_poll+0x75/0x100 [<ffffffff819a6524>] entry_SYSCALL_64_fastpath+0x24/0xcf
Commit 79e7fff47b7b ("net: remove support for per driver ndo_busy_poll()") indirectly fixed this upstream in linux-4.11 by removing the offending pointer usage. No other users of napi->dev touch its netdev_ops.
---
This is a straightforward backport of the 4.9.y fix[1] for this crash, which doesn't apply to the older LTS releases. Only build-tested on 4.4.y, as I don't have access to wireless hardware and firmware that runs on older LTS kernels.
[1]: https://lore.kernel.org/stable/[email protected]/T/#u
include/net/busy_poll.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/busy_poll.h +1 -1
@@ -93,7 +93,7 @@ static inline bool sk_busy_loop(struct s goto out; ops = napi->dev->netdev_ops; -if (!ops->ndo_busy_poll) +if (!ops || !ops->ndo_busy_poll) goto out; do {
Greg Kroah-Hartman
maintainerPATCH 48/73 um: Compile with modern headers
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
commit 530ba6c7cb3c22435a4d26de47037bb6f86a5329 upstream.
Recent libcs have gotten a bit more strict, so we actually need to include the right headers and use the right types. This enables UML to compile again.
--- arch/um/os-Linux/file.c | 1 + arch/um/os-Linux/signal.c | 2 ++ arch/x86/um/stub_segv.c | 1 + 3 files changed, 4 insertions(+)
arch/um/os-Linux/file.c +1 -0
@@ -12,6 +12,7 @@#include <sys/mount.h> #include <sys/socket.h> #include <sys/stat.h> +#include <sys/sysmacros.h> #include <sys/un.h> #include <sys/types.h> #include <os.h>
arch/um/os-Linux/signal.c +2 -0
@@ -14,7 +14,9 @@#include <as-layout.h> #include <kern_util.h> #include <os.h> +#include <sys/ucontext.h> #include <sysdep/mcontext.h> +#include <um_malloc.h> void (*sig_info[NSIG ])(int ,struct siginfo *,struct uml_pt_regs *) = { [SIGTRAP ] = relay_signal,
arch/x86/um/stub_segv.c +1 -0
@@ -6,6 +6,7 @@#include <sysdep/stub.h> #include <sysdep/faultinfo.h> #include <sysdep/mcontext.h> +#include <sys/ucontext.h> void __attribute__ ((__section__ (".__syscall_stub" )))stub_segv_handler (int sig,siginfo_t *info,void *p)
Greg Kroah-Hartman
maintainerPATCH 49/73 ASoC : cs4265 : readable register too low
In reply to Greg Kroah-Hartman[ Upstream commit f3df05c805983427319eddc2411a2105ee1757cf ]
The cs4265_readable_register function stopped short of the maximum register.
An example bug is taken from :
https://github.com/Audio-Injector/Ultra/issues/25
Where alsactl store fails with :
Cannot read control '2,0,0,C Data Buffer,0': Input/output error
This patch fixes the bug by setting the cs4265 to have readable registers up to the maximum hardware register CS4265_MAX_REGISTER.
--- sound/soc/codecs/cs4265.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/cs4265.c +1 -1
@@ -60,7 +60,7 @@ static const struct reg_default cs4265_reg_defaults[] = {static bool cs4265_readable_register (struct device *dev,unsigned int reg) {switch (reg) { - case CS4265_CHIP_ID ... CS4265_SPDIF_CTL2: + case CS4265_CHIP_ID ... CS4265_MAX_REGISTER:return true;default :return false;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/73 ASoC: max98090: remove 24-bit format support if RJ is 0
In reply to Greg Kroah-Hartman[ Upstream commit 5628c8979642a076f91ee86c3bae5ad251639af0 ]
The supported formats are S16_LE and S24_LE now. However, by datasheet of max98090, S24_LE is only supported when it is in the right justified mode. We should remove 24-bit format if it is not in that mode to avoid triggering error.
--- sound/soc/codecs/max98090.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
sound/soc/codecs/max98090.c +16 -0
@@ -1924,6 +1924,21 @@ static int max98090_configure_dmic(struct max98090_priv *max98090,return 0 ; } +static int max98090_dai_startup (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct snd_soc_component *component = dai->component; +struct max98090_priv *max98090 =snd_soc_component_get_drvdata (component); +unsigned int fmt = max98090->dai_fmt; + +/* Remove 24-bit format support if it is not in right justified mode. */ +if ((fmt &SND_SOC_DAIFMT_FORMAT_MASK ) !=SND_SOC_DAIFMT_RIGHT_J ) { + substream->runtime->hw.formats =SNDRV_PCM_FMTBIT_S16_LE ; +snd_pcm_hw_constraint_msbits (substream->runtime,0 ,16 ,16 ); + } +return 0 ; +} +static int max98090_dai_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params,struct snd_soc_dai *dai)
@@ -2331,6 +2346,7 @@ EXPORT_SYMBOL_GPL(max98090_mic_detect);#define MAX98090_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE)static const struct snd_soc_dai_ops max98090_dai_ops = { + .startup = max98090_dai_startup, .set_sysclk = max98090_dai_set_sysclk, .set_fmt = max98090_dai_set_fmt, .set_tdm_slot = max98090_set_tdm_slot,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/73 usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i]
In reply to Greg Kroah-Hartman[ Upstream commit 62fd0e0a24abeebe2c19fce49dd5716d9b62042d ]
There is no deallocation of fusb300->ep[i] elements, allocated at fusb300_probe.
The patch adds deallocation of fusb300->ep array elements.
--- drivers/usb/gadget/udc/fusb300_udc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/gadget/udc/fusb300_udc.c +5 -0
@@ -1345,12 +1345,15 @@ static const struct usb_gadget_ops fusb300_gadget_ops = {static int fusb300_remove (struct platform_device *pdev) {struct fusb300 *fusb300 =platform_get_drvdata (pdev); +int i;usb_del_gadget_udc (&fusb300->gadget);iounmap (fusb300->reg);free_irq (platform_get_irq (pdev,0 ), fusb300);fusb300_free_request (&fusb300->ep[0 ]->ep, fusb300->ep0_req); +for (i =0 ; i <FUSB300_MAX_NUM_EP ; i++) +kfree (fusb300->ep[i]);kfree (fusb300);return 0 ;
@@ -1494,6 +1497,8 @@ clean_up:if (fusb300->ep0_req)fusb300_free_request (&fusb300->ep[0 ]->ep, fusb300->ep0_req); +for (i =0 ; i <FUSB300_MAX_NUM_EP ; i++) +kfree (fusb300->ep[i]);kfree (fusb300); }if (reg)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/73 usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
In reply to Greg Kroah-Hartman[ Upstream commit fbc318afadd6e7ae2252d6158cf7d0c5a2132f7d ]
Gadget drivers may queue request in interrupt context. This would lead to a descriptor allocation in that context. In that case we would hit BUG_ON(in_interrupt()) in __get_vm_area_node.
Also remove the unnecessary cast.
--- drivers/usb/gadget/udc/lpc32xx_udc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -2
@@ -964,8 +964,7 @@ static struct lpc32xx_usbd_dd_gad *udc_dd_alloc(struct lpc32xx_udc *udc)dma_addr_t dma;struct lpc32xx_usbd_dd_gad *dd; - dd = (struct lpc32xx_usbd_dd_gad *)dma_pool_alloc ( - udc->dd_cache, (GFP_KERNEL |GFP_DMA ), &dma); + dd =dma_pool_alloc (udc->dd_cache,GFP_ATOMIC |GFP_DMA , &dma);if (dd) dd->this_dma = dma;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/73 scsi: hpsa: correct ioaccel2 chaining
In reply to Greg Kroah-Hartman[ Upstream commit 625d7d3518875c4d303c652a198feaa13d9f52d9 ]
- set ioaccel2_sg_element member 'chain_indicator' to IOACCEL2_LAST_SG for the last s/g element.
- set ioaccel2_sg_element member 'chain_indicator' to IOACCEL2_CHAIN when chaining.
--- drivers/scsi/hpsa.c | 7 ++++++- drivers/scsi/hpsa_cmd.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/scsi/hpsa.c +6 -1
@@ -4562,7 +4562,7 @@ static int hpsa_scsi_ioaccel2_queue_command(struct ctlr_info *h, curr_sg->reserved[0 ] =0 ; curr_sg->reserved[1 ] =0 ; curr_sg->reserved[2 ] =0 ; - curr_sg->chain_indicator =0x80 ; + curr_sg->chain_indicator =IOACCEL2_CHAIN ; curr_sg = h->ioaccel2_cmd_sg_list[c->cmdindex]; }
@@ -4579,6 +4579,11 @@ static int hpsa_scsi_ioaccel2_queue_command(struct ctlr_info *h, curr_sg++; } +/* +* Set the last s/g element bit +*/ + (curr_sg -1 )->chain_indicator =IOACCEL2_LAST_SG ; +switch (cmd->sc_data_direction) {case DMA_TO_DEVICE : cp->direction &= ~IOACCEL2_DIRECTION_MASK ;
drivers/scsi/hpsa_cmd.h +1 -0
@@ -513,6 +513,7 @@ struct ioaccel2_sg_element {u8 reserved[3 ];u8 chain_indicator;#define IOACCEL2_CHAIN 0x80 +#define IOACCEL2_LAST_SG 0x40 };/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/73 ARC: Assume multiplier is always present
In reply to Greg Kroah-Hartman[ Upstream commit 0eca6fdb3193410fbe66b6f064431cc394513e82 ]
It is unlikely that designs running Linux will not have multiplier. Further the current support is not complete as tool don't generate a multilib w/o multiplier.
--- arch/arc/Kconfig | 8 -------- arch/arc/Makefile | 4 ---- arch/arc/kernel/setup.c | 2 -- 3 files changed, 14 deletions(-)
arch/arc/Kconfig +0 -8
@@ -278,14 +278,6 @@ config ARC_DCCM_BASE default "0xA0000000" depends on ARC_HAS_DCCM -config ARC_HAS_HW_MPY - bool "Use Hardware Multiplier (Normal or Faster XMAC)" - default y - help - Influences how gcc generates code for MPY operations. - If enabled, MPYxx insns are generated, provided by Standard/XMAC - Multipler. Otherwise software multipy lib is used - choice prompt "MMU Version" default ARC_MMU_V3 if ARC_CPU_770
arch/arc/Makefile +0 -4
@@ -72,10 +72,6 @@ ldflags-$(CONFIG_CPU_BIG_ENDIAN) += -EB # --build-id w/o "-marclinux". Default arc-elf32-ld is OK ldflags-$(upto_gcc44) += -marclinux -ifndef CONFIG_ARC_HAS_HW_MPY - cflags-y += -mno-mpy -endif - LIBGCC := $(shell $(CC) $(cflags-y) --print-libgcc-file-name) # Modules with short calls might break for calls into builtin-kernel
arch/arc/kernel/setup.c +0 -2
@@ -232,8 +232,6 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len) n +=scnprintf (buf + n, len - n,"mpy[opt %d] " , opt); } - n +=scnprintf (buf + n, len - n,"%s" , -IS_USED_CFG (CONFIG_ARC_HAS_HW_MPY )); } n += scnprintf(buf + n, len - n, "%s%s%s%s%s%s%s%s\n",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/73 perf ui helpline: Use strlcpy() as a shorter form of strncpy() + explicit set nul
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
commit 4d0f16d059ddb91424480d88473f7392f24aebdc upstream.
The strncpy() function may leave the destination string buffer unterminated, better use strlcpy() that we have a __weak fallback implementation for systems without it.
In this case we are actually setting the null byte at the right place, but since we pass the buffer size as the limit to strncpy() and not it minus one, gcc ends up warning us about that, see below. So, lets just switch to the shorter form provided by strlcpy().
This fixes this warning on an Alpine Linux Edge system with gcc 8.2:
ui/tui/helpline.c: In function 'tui_helpline__push':
ui/tui/helpline.c:27:2: error: 'strncpy' specified bound 512 equals destination size [-Werror=stringop-truncation]
strncpy(ui_helpline__current, msg, sz)[sz - 1] = '\0';
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
--- tools/perf/ui/tui/helpline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/ui/tui/helpline.c +1 -1
@@ -23,7 +23,7 @@ static void tui_helpline__push(const chaSLsmg_set_color (0 );SLsmg_write_nstring ((char *)msg, SLtt_Screen_Cols);SLsmg_refresh (); -strncpy (ui_helpline__current, msg, sz)[sz -1 ] ='\0' ; +strlcpy (ui_helpline__current, msg, sz); }static int tui_helpline__show (const char *format,va_list ap)
Greg Kroah-Hartman
maintainerPATCH 57/73 MIPS: math-emu: do not use bools for arithmetic
In reply to Greg Kroah-Hartman[ Upstream commit 8535f2ba0a9b971df62a5890699b9dfe2e0d5580 ]
GCC-7 complains about a boolean value being used with an arithmetic AND:
arch/mips/math-emu/cp1emu.c: In function 'cop1Emulate':arch/mips/math-emu/cp1emu.c:838:14: warning: '~' on a boolean expression [-Wbool-operation]
fpr = (x) & ~(cop1_64bit(xcp) == 0); \
^arch/mips/math-emu/cp1emu.c:1068:3: note: in expansion of macro 'DITOREG'
DITOREG(dval, MIPSInst_RT(ir));
^~~~~~~arch/mips/math-emu/cp1emu.c:838:14: note: did you mean to use logical not?
fpr = (x) & ~(cop1_64bit(xcp) == 0); \
Since cop1_64bit() returns and int, just flip the LSB.
Patchwork: https://patchwork.linux-mips.org/patch/17058/
--- arch/mips/math-emu/cp1emu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/math-emu/cp1emu.c +2 -2
@@ -829,12 +829,12 @@ do { \ } while (0)#define DIFROMREG (di, x) \ - ((di) = get_fpr64(&ctx->fpr[(x) & ~(cop1_64bit(xcp) == 0)], 0)) + ((di) = get_fpr64(&ctx->fpr[(x) & ~(cop1_64bit(xcp) ^ 1)], 0))#define DITOREG (di, x) \ do { \ unsigned fpr, i; \ - fpr = (x) & ~(cop1_64bit(xcp) == 0); \ + fpr = (x) & ~(cop1_64bit(xcp) ^ 1); \ set_fpr64(&ctx->fpr[fpr], 0, di); \ for (i = 1; i < ARRAY_SIZE(ctx->fpr[x].val64); i++) \ set_fpr64(&ctx->fpr[fpr], i, 0); \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/73 swiotlb: Make linux/swiotlb.h standalone includible
In reply to Greg Kroah-Hartman[ Upstream commit 386744425e35e04984c6e741c7750fd6eef1a9df ]
This header file uses the enum dma_data_direction and struct page types without explicitly including the corresponding header files. This makes it rely on the includer to have included the proper headers before.
To fix this, include linux/dma-direction.h and forward-declare struct page. The swiotlb_free() function is also annotated __init, therefore requires linux/init.h to be included as well.
--- include/linux/swiotlb.h | 3 +++ 1 file changed, 3 insertions(+)
include/linux/swiotlb.h +3 -0
@@ -1,10 +1,13 @@#ifndef __LINUX_SWIOTLB_H#define __LINUX_SWIOTLB_H +#include <linux/dma-direction.h> +#include <linux/init.h> #include <linux/types.h> struct device ;struct dma_attrs ; +struct page ;struct scatterlist ;extern int swiotlb_force;
Greg Kroah-Hartman
maintainerPATCH 60/73 bug.h: work around GCC PR82365 in BUG()
In reply to Greg Kroah-Hartman[ Upstream commit 173a3efd3edb2ef6ef07471397c5f542a360e9c1 ]
Looking at functions with large stack frames across all architectures led me discovering that BUG() suffers from the same problem as fortify_panic(), which I've added a workaround for already.
In short, variables that go out of scope by calling a noreturn function or __builtin_unreachable() keep using stack space in functions afterwards.
A workaround that was identified is to insert an empty assembler statement just before calling the function that doesn't return. I'm adding a macro "barrier_before_unreachable()" to document this, and insert calls to that in all instances of BUG() that currently suffer from this problem.
The files that saw the largest change from this had these frame sizes before, and much less with my patch:
fs/ext4/inode.c:82:1: warning: the frame size of 1672 bytes is larger than 800 bytes [-Wframe-larger-than=] fs/ext4/namei.c:434:1: warning: the frame size of 904 bytes is larger than 800 bytes [-Wframe-larger-than=] fs/ext4/super.c:2279:1: warning: the frame size of 1160 bytes is larger than 800 bytes [-Wframe-larger-than=] fs/ext4/xattr.c:146:1: warning: the frame size of 1168 bytes is larger than 800 bytes [-Wframe-larger-than=] fs/f2fs/inode.c:152:1: warning: the frame size of 1424 bytes is larger than 800 bytes [-Wframe-larger-than=] net/netfilter/ipvs/ip_vs_core.c:1195:1: warning: the frame size of 1068 bytes is larger than 800 bytes [-Wframe-larger-than=] net/netfilter/ipvs/ip_vs_core.c:395:1: warning: the frame size of 1084 bytes is larger than 800 bytes [-Wframe-larger-than=] net/netfilter/ipvs/ip_vs_ftp.c:298:1: warning: the frame size of 928 bytes is larger than 800 bytes [-Wframe-larger-than=] net/netfilter/ipvs/ip_vs_ftp.c:418:1: warning: the frame size of 908 bytes is larger than 800 bytes [-Wframe-larger-than=] net/netfilter/ipvs/ip_vs_lblcr.c:718:1: warning: the frame size of 960 bytes is larger than 800 bytes [-Wframe-larger-than=] drivers/net/xen-netback/netback.c:1500:1: warning: the frame size of 1088 bytes is larger than 800 bytes [-Wframe-larger-than=]
In case of ARC and CRIS, it turns out that the BUG() implementation actually does return (or at least the compiler thinks it does), resulting in lots of warnings about uninitialized variable use and leaving noreturn functions, such as:
block/cfq-iosched.c: In function 'cfq_async_queue_prio':
block/cfq-iosched.c:3804:1: error: control reaches end of non-void function [-Werror=return-type] include/linux/dmaengine.h: In function 'dma_maxpq':
include/linux/dmaengine.h:1123:1: error: control reaches end of non-void function [-Werror=return-type]
This makes them call __builtin_trap() instead, which should normally dump the stack and kill the current process, like some of the other architectures already do.
I tried adding barrier_before_unreachable() to panic() and fortify_panic() as well, but that had very little effect, so I'm not submitting that patch.
Vineet said:
: For ARC, it is double win.
:
: 1. Fixes 3 -Wreturn-type warnings
:
: | ../net/core/ethtool.c:311:1: warning: control reaches end of non-void function : [-Wreturn-type]
: | ../kernel/sched/core.c:3246:1: warning: control reaches end of non-void function : [-Wreturn-type]
: | ../include/linux/sunrpc/svc_xprt.h:180:1: warning: control reaches end of : non-void function [-Wreturn-type]
:
: 2. bloat-o-meter reports code size improvements as gcc elides the
: generated code for stack return.
--- arch/arc/include/asm/bug.h | 3 ++- arch/ia64/include/asm/bug.h | 6 +++++- arch/m68k/include/asm/bug.h | 3 +++ arch/sparc/include/asm/bug.h | 6 +++++- include/asm-generic/bug.h | 1 + include/linux/compiler-gcc.h | 15 ++++++++++++++- include/linux/compiler.h | 5 +++++ 7 files changed, 35 insertions(+), 4 deletions(-)
arch/arc/include/asm/bug.h +2 -1
@@ -23,7 +23,8 @@ void die(const char *str, struct pt_regs#define BUG () do { \ pr_warn("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \ - dump_stack(); \ + barrier_before_unreachable(); \ + __builtin_trap(); \ } while (0)#define HAVE_ARCH_BUG
arch/ia64/include/asm/bug.h +5 -1
@@ -3,7 +3,11 @@#ifdef CONFIG_BUG #define ia64_abort () __builtin_trap() -#define BUG () do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0) +#define BUG () do { \ + printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ + barrier_before_unreachable(); \ + ia64_abort(); \ +} while (0)/* should this BUG be made generic? */ #define HAVE_ARCH_BUG
arch/m68k/include/asm/bug.h +3 -0
@@ -7,16 +7,19 @@#ifndef CONFIG_SUN3 #define BUG () do { \ printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ + barrier_before_unreachable(); \ __builtin_trap(); \ } while (0)#else #define BUG () do { \ printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ + barrier_before_unreachable(); \ panic("BUG!"); \ } while (0)#endif #else #define BUG () do { \ + barrier_before_unreachable(); \ __builtin_trap(); \ } while (0)#endif
arch/sparc/include/asm/bug.h +5 -1
@@ -8,10 +8,14 @@void do_BUG (const char *file,int line);#define BUG () do { \ do_BUG(__FILE__, __LINE__); \ + barrier_before_unreachable(); \ __builtin_trap(); \ } while (0)#else -#define BUG () __builtin_trap() +#define BUG () do { \ + barrier_before_unreachable(); \ + __builtin_trap(); \ +} while (0)#endif #define HAVE_ARCH_BUG
include/asm-generic/bug.h +1 -0
@@ -47,6 +47,7 @@ struct bug_entry {#ifndef HAVE_ARCH_BUG #define BUG () do { \ printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \ + barrier_before_unreachable(); \ panic("BUG!"); \ } while (0)#endif
include/linux/compiler-gcc.h +14 -1
@@ -207,6 +207,15 @@#if GCC_VERSION >=40500 /* +* calling noreturn functions, __builtin_unreachable() and __builtin_trap() +* confuse the stack allocation in gcc, leading to overly large stack +* frames, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82365 +* +* Adding an empty inline assembly before it works around the problem +*/ +#define barrier_before_unreachable () asm volatile("") + +/* * Mark a position in code as unreachable. This can be used to * suppress control flow warnings after asm blocks that transfer * control elsewhere.
@@ -215,7 +224,11 @@* this in the preprocessor, but we can live with this because they're * unreleased. Really, we need to have autoconf for the kernel. */ -#define unreachable () __builtin_unreachable() +#define unreachable () \ + do { \ + barrier_before_unreachable(); \ + __builtin_unreachable(); \ + } while (0)/* Mark a function definition as prohibited from being cloned. */ #define __noclone __attribute__((__noclone__, __optimize__("no-tracer")))
include/linux/compiler.h +5 -0
@@ -175,6 +175,11 @@ void ftrace_likely_update(struct ftrace_# define barrier_data (ptr) barrier()#endif +/* workaround for GCC PR82365 if needed */ +#ifndef barrier_before_unreachable +# define barrier_before_unreachable () do { } while (0) +#endif +/* Unreachable code */ #ifndef unreachable# define unreachable () do { } while (1)
Greg Kroah-Hartman
maintainerPATCH 61/73 MIPS: Workaround GCC __builtin_unreachable reordering bug
In reply to Greg Kroah-Hartman[ Upstream commit 906d441febc0de974b2a6ef848a8f058f3bfada3 ]
Some versions of GCC for the MIPS architecture suffer from a bug which can lead to instructions from beyond an unreachable statement being incorrectly reordered into earlier branch delay slots if the unreachable statement is the only content of a case in a switch statement. This can lead to seemingly random behaviour, such as invalid memory accesses from incorrectly reordered loads or stores, and link failures on microMIPS builds.
See this potential GCC fix for details:
https://gcc.gnu.org/ml/gcc-patches/2015-09/msg00360.html
Runtime problems resulting from this bug were initially observed using a maltasmvp_defconfig v4.4 kernel built using GCC 4.9.2 (from a Codescape SDK 2015.06-05 toolchain), with the result being an address exception taken after log messages about the L1 caches (during probe of the L2 cache):
Initmem setup node 0 [mem 0x0000000080000000-0x000000009fffffff] VPE topology {2,2} total 4
Primary instruction cache 64kB, VIPT, 4-way, linesize 32 bytes. Primary data cache 64kB, 4-way, PIPT, no aliases, linesize 32 bytes <AdEL exception here>
This is early enough that the kernel exception vectors are not in use, so any further output depends upon the bootloader. This is reproducible in QEMU where no further output occurs - ie. the system hangs here. Given the nature of the bug it may potentially be hit with differing symptoms. The bug is known to affect GCC versions as recent as 7.3, and it is unclear whether GCC 8 fixed it or just happens not to encounter the bug in the testcase found at the link above due to differing optimizations.
This bug can be worked around by placing a volatile asm statement, which GCC is prevented from reordering past, prior to the __builtin_unreachable call.
That was actually done already for other reasons by commit 173a3efd3edb ("bug.h: work around GCC PR82365 in BUG()"), but creates problems for microMIPS builds due to the lack of a .insn directive. The microMIPS ISA allows for interlinking with regular MIPS32 code by repurposing bit 0 of the program counter as an ISA mode bit. To switch modes one changes the value of this bit in the PC. However typical branch instructions encode their offsets as multiples of 2-byte instruction halfwords, which means they cannot change ISA mode - this must be done using either an indirect branch (a jump-register in MIPS terminology) or a dedicated jalx instruction. In order to ensure that regular branches don't attempt to target code in a different ISA which they can't actually switch to, the linker will check that branch targets are code in the same ISA as the branch.
Unfortunately our empty asm volatile statements don't qualify as code, and the link for microMIPS builds fails with errors such as:
arch/mips/mm/dma-default.s:3265: Error: branch to a symbol in another ISA mode arch/mips/mm/dma-default.s:5027: Error: branch to a symbol in another ISA mode
Resolve this by adding a .insn directive within the asm statement which declares that what comes next is code. This may or may not be true, since we don't really know what comes next, but as this code is in an unreachable path anyway that doesn't matter since we won't execute it.
We do this in asm/compiler.h & select CONFIG_HAVE_ARCH_COMPILER_H in order to have this included by linux/compiler_types.h after linux/compiler-gcc.h. This will result in asm/compiler.h being included in all C compilations via the -include linux/compiler_types.h argument in c_flags, which should be harmless.
Patchwork: https://patchwork.linux-mips.org/patch/20270/
--- arch/mips/Kconfig | 1 + arch/mips/include/asm/compiler.h | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+)
arch/mips/Kconfig +1 -0
@@ -13,6 +13,7 @@ config MIPS select HAVE_OPROFILE select HAVE_PERF_EVENTS select PERF_USE_VMALLOC + select HAVE_ARCH_COMPILER_H select HAVE_ARCH_KGDB select HAVE_ARCH_SECCOMP_FILTER select HAVE_ARCH_TRACEHOOK
arch/mips/include/asm/compiler.h +35 -0
@@ -8,6 +8,41 @@#ifndef _ASM_COMPILER_H#define _ASM_COMPILER_H +/* +* With GCC 4.5 onwards we can use __builtin_unreachable to indicate to the +* compiler that a particular code path will never be hit. This allows it to be +* optimised out of the generated binary. +* +* Unfortunately at least GCC 4.6.3 through 7.3.0 inclusive suffer from a bug +* that can lead to instructions from beyond an unreachable statement being +* incorrectly reordered into earlier delay slots if the unreachable statement +* is the only content of a case in a switch statement. This can lead to +* seemingly random behaviour, such as invalid memory accesses from incorrectly +* reordered loads or stores. See this potential GCC fix for details: +* +* https://gcc.gnu.org/ml/gcc-patches/2015-09/msg00360.html +* +* It is unclear whether GCC 8 onwards suffer from the same issue - nothing +* relevant is mentioned in GCC 8 release notes and nothing obviously relevant +* stands out in GCC commit logs, but these newer GCC versions generate very +* different code for the testcase which doesn't exhibit the bug. +* +* GCC also handles stack allocation suboptimally when calling noreturn +* functions or calling __builtin_unreachable(): +* +* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82365 +* +* We work around both of these issues by placing a volatile asm statement, +* which GCC is prevented from reordering past, prior to __builtin_unreachable +* calls. +* +* The .insn statement is required to ensure that any branches to the +* statement, which sadly must be kept due to the asm statement, are known to +* be branches to code and satisfy linker requirements for microMIPS kernels. +*/ +#undef barrier_before_unreachable +#define barrier_before_unreachable () asm volatile(".insn") +#if __GNUC__ >3 || (__GNUC__ ==3 && __GNUC_MINOR__ >=4 )#define GCC_IMM_ASM () "n"#define GCC_REG_ACCUM "$0"
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/73 ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit 6994eefb0053799d2e07cd140df6c2ea106c41ee upstream.
Fix two issues:
When called for PTRACE_TRACEME, ptrace_link() would obtain an RCU reference to the parent's objective credentials, then give that pointer to get_cred(). However, the object lifetime rules for things like struct cred do not permit unconditionally turning an RCU reference into a stable reference.
PTRACE_TRACEME records the parent's credentials as if the parent was acting as the subject, but that's not the case. If a malicious unprivileged child uses PTRACE_TRACEME and the parent is privileged, and at a later point, the parent process becomes attacker-controlled (because it drops privileges and calls execve()), the attacker ends up with control over two processes with a privileged ptrace relationship, which can be abused to ptrace a suid binary and obtain root privileges.
Fix both of these by always recording the credentials of the process that is requesting the creation of the ptrace relationship:current_cred() can't change under us, and current is the proper subject for access control.
This change is theoretically userspace-visible, but I am not aware of any code that it will actually break.
--- kernel/ptrace.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
kernel/ptrace.c +1 -3
@@ -45,9 +45,7 @@ void __ptrace_link(struct task_struct *c*/ static void ptrace_link (struct task_struct *child,struct task_struct *new_parent) { -rcu_read_lock (); -__ptrace_link (child, new_parent,__task_cred (new_parent)); -rcu_read_unlock (); +__ptrace_link (child, new_parent,current_cred ()); }/**
Greg Kroah-Hartman
maintainerPATCH 63/73 crypto: user - prevent operating on larval algorithms
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit 21d4120ec6f5b5992b01b96ac484701163917b63 upstream.
Michal Suchanek reported [1] that running the pcrypt_aead01 test from LTP [2] in a loop and holding Ctrl-C causes a NULL dereference of alg->cra_users.next in crypto_remove_spawns(), via crypto_del_alg(). The test repeatedly uses CRYPTO_MSG_NEWALG and CRYPTO_MSG_DELALG.
The crash occurs when the instance that CRYPTO_MSG_DELALG is trying to unregister isn't a real registered algorithm, but rather is a "test larval", which is a special "algorithm" added to the algorithms list while the real algorithm is still being tested. Larvals don't have initialized cra_users, so that causes the crash. Normally pcrypt_aead01 doesn't trigger this because CRYPTO_MSG_NEWALG waits for the algorithm to be tested; however, CRYPTO_MSG_NEWALG returns early when interrupted.
Everything else in the "crypto user configuration" API has this same bug too, i.e. it inappropriately allows operating on larval algorithms (though it doesn't look like the other cases can cause a crash).
Fix this by making crypto_alg_match() exclude larval algorithms.
[1] https://lkml.kernel.org/r/[email protected]
[2] https://github.com/linux-test-project/ltp/blob/20190517/testcases/kernel/crypto/pcrypt_aead01.c
--- crypto/crypto_user.c | 3 +++ 1 file changed, 3 insertions(+)
crypto/crypto_user.c +3 -0
@@ -54,6 +54,9 @@ static struct crypto_alg *crypto_alg_matlist_for_each_entry (q, &crypto_alg_list, cra_list) {int match =0 ; +if (crypto_is_larval (q)) +continue ; +if ((q->cra_flags ^ p->cru_type) & p->cru_mask)continue ;
Greg Kroah-Hartman
maintainerPATCH 64/73 ALSA: seq: fix incorrect order of dest_client/dest_ports arguments
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit c3ea60c231446663afd6ea1054da6b7f830855ca upstream.
There are two occurrances of a call to snd_seq_oss_fill_addr where the dest_client and dest_port arguments are in the wrong order. Fix this by swapping them around.
Addresses-Coverity: ("Arguments in wrong order")
--- sound/core/seq/oss/seq_oss_ioctl.c | 2 +- sound/core/seq/oss/seq_oss_rw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
sound/core/seq/oss/seq_oss_ioctl.c +1 -1
@@ -62,7 +62,7 @@ static int snd_seq_oss_oob_user(struct sif (copy_from_user (ev, arg,8 ))return -EFAULT ;memset (&tmpev,0 ,sizeof (tmpev)); -snd_seq_oss_fill_addr (dp, &tmpev, dp->addr.port, dp->addr.client); +snd_seq_oss_fill_addr (dp, &tmpev, dp->addr.client, dp->addr.port); tmpev.time.tick =0 ;if (!snd_seq_oss_process_event (dp, (union evrec *)ev, &tmpev)) {snd_seq_oss_dispatch (dp, &tmpev,0 ,0 );
sound/core/seq/oss/seq_oss_rw.c +1 -1
@@ -174,7 +174,7 @@ insert_queue(struct seq_oss_devinfo *dp,memset (&event,0 ,sizeof (event));/* set dummy -- to be sure */ event.type =SNDRV_SEQ_EVENT_NOTEOFF ; -snd_seq_oss_fill_addr (dp, &event, dp->addr.port, dp->addr.client); +snd_seq_oss_fill_addr (dp, &event, dp->addr.client, dp->addr.port);if (snd_seq_oss_process_event (dp, rec, &event))return 0 ;/* invalid event - no need to insert queue */
Greg Kroah-Hartman
maintainerPATCH 65/73 ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
commit 7fbd1753b64eafe21cf842348a40a691d0dee440 upstream.
In IEC 61883-6, 8 MIDI data streams are multiplexed into single MIDI conformant data channel. The index of stream is calculated by modulo 8 of the value of data block counter.
In fireworks, the value of data block counter in CIP header has a quirk with firmware version v5.0.0, v5.7.3 and v5.8.0. This brings ALSA IEC 61883-1/6 packet streaming engine to miss detection of MIDI messages.
This commit fixes the miss detection to modify the value of data block counter for the modulo calculation.
For maintainers, this bug exists since a commit 18f5ed365d3f ("ALSA:
fireworks/firewire-lib: add support for recent firmware quirk") in Linux kernel v4.2. There're many changes since the commit. This fix can be backported to Linux kernel v4.4 or later. I tagged a base commit to the backport for your convenience.
Besides, my work for Linux kernel v5.3 brings heavy code refactoring and some structure members are renamed in 'sound/firewire/amdtp-stream.h'. The content of this patch brings conflict when merging -rc tree with this patch and the latest tree. I request maintainers to solve the conflict to replace 'tx_first_dbc' with 'ctx_data.tx.first_dbc'.
--- sound/firewire/amdtp-am824.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/firewire/amdtp-am824.c +1 -1
@@ -388,7 +388,7 @@ static void read_midi_messages(struct amu8 *b;for (f =0 ; f < frames; f++) { - port = (s->data_block_counter + f) %8 ; + port = (8 - s->tx_first_dbc + s->data_block_counter + f) %8 ; b = (u8 *)&buffer[p->midi_position]; len = b[0 ] -0x80 ;
Greg Kroah-Hartman
maintainerPATCH 30/73 perf help: Remove needless use of strncpy()
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
commit b6313899f4ed2e76b8375cf8069556f5b94fbff0 upstream.
Since we make sure the destination buffer has at least strlen(orig) + 1, no need to do a strncpy(dest, orig, strlen(orig)), just use strcpy(dest, orig).
This silences this gcc 8.2 warning on Alpine Linux:
In function 'add_man_viewer',
inlined from 'perf_help_config' at builtin-help.c:284:3:
builtin-help.c:192:2: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
strncpy((*p)->name, name, len);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
builtin-help.c: In function 'perf_help_config':
builtin-help.c:187:15: note: length computed here
size_t len = strlen(name);
^~~~~~~~~~~~--- tools/perf/builtin-help.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-help.c +1 -1
@@ -179,7 +179,7 @@ static void add_man_viewer(const char *nwhile (*p) p = &((*p)->next); *p =zalloc (sizeof (**p) + len +1 ); -strncpy ((*p)->name, name, len); +strcpy ((*p)->name, name); }static int supported_man_viewer (const char *name,size_t len)
Greg Kroah-Hartman
maintainerPATCH 66/73 ALSA: usb-audio: fix sign unintended sign extension on left shifts
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit 2acf5a3e6e9371e63c9e4ff54d84d08f630467a0 upstream.
There are a couple of left shifts of unsigned 8 bit values that first get promoted to signed ints and hence get sign extended on the shift if the top bit of the 8 bit values are set. Fix this by casting the 8 bit values to unsigned ints to stop the unintentional sign extension.
Addresses-Coverity: ("Unintended sign extension")
--- sound/usb/mixer_quirks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/usb/mixer_quirks.c +2 -2
@@ -753,7 +753,7 @@ static int snd_ni_control_init_val(strucreturn err; } - kctl->private_value |= (value <<24 ); + kctl->private_value |= ((unsigned int )value <<24 );return 0 ; }
@@ -914,7 +914,7 @@ static int snd_ftu_eff_switch_init(strucif (err <0 )return err; - kctl->private_value |= value[0 ] <<24 ; + kctl->private_value |= (unsigned int )value[0 ] <<24 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 68/73 btrfs: Ensure replaced device doesnt have pending chunk allocation
In reply to Greg Kroah-HartmanFrom: Nikolay Borisov <[email protected]>
commit debd1c065d2037919a7da67baf55cc683fee09f0 upstream.
Recent FITRIM work, namely bbbf7243d62d ("btrfs: combine device update operations during transaction commit") combined the way certain operations are recoded in a transaction. As a result an ASSERT was added in dev_replace_finish to ensure the new code works correctly. Unfortunately I got reports that it's possible to trigger the assert, meaning that during a device replace it's possible to have an unfinished chunk allocation on the source device.
This is supposed to be prevented by the fact that a transaction is committed before finishing the replace oepration and alter acquiring the chunk mutex. This is not sufficient since by the time the transaction is committed and the chunk mutex acquired it's possible to allocate a chunk depending on the workload being executed on the replaced device. This bug has been present ever since device replace was introduced but there was never code which checks for it.
The correct way to fix is to ensure that there is no pending device modification operation when the chunk mutex is acquire and if there is repeat transaction commit. Unfortunately it's not possible to just exclude the source device from btrfs_fs_devices::dev_alloc_list since this causes ENOSPC to be hit in transaction commit.
Fixing that in another way would need to add special cases to handle the last writes and forbid new ones. The looped transaction fix is more obvious, and can be easily backported. The runtime of dev-replace is long so there's no noticeable delay caused by that.
--- fs/btrfs/dev-replace.c | 29 +++++++++++++++++++---------- fs/btrfs/volumes.c | 2 ++ fs/btrfs/volumes.h | 5 +++++ 3 files changed, 26 insertions(+), 10 deletions(-)
fs/btrfs/dev-replace.c +19 -10
@@ -495,18 +495,27 @@ static int btrfs_dev_replace_finishing(s }btrfs_wait_ordered_roots (root->fs_info,-1 ); - trans =btrfs_start_transaction (root,0 ); -if (IS_ERR (trans)) { -mutex_unlock (&dev_replace->lock_finishing_cancel_unmount); -return PTR_ERR (trans); +while (1 ) { + trans =btrfs_start_transaction (root,0 ); +if (IS_ERR (trans)) { +mutex_unlock (&dev_replace->lock_finishing_cancel_unmount); +return PTR_ERR (trans); + } + ret =btrfs_commit_transaction (trans, root); +WARN_ON (ret); +mutex_lock (&uuid_mutex); +/* keep away write_all_supers() during the finishing procedure */ +mutex_lock (&root->fs_info->fs_devices->device_list_mutex); +mutex_lock (&root->fs_info->chunk_mutex); +if (src_device->has_pending_chunks) { +mutex_unlock (&root->fs_info->chunk_mutex); +mutex_unlock (&root->fs_info->fs_devices->device_list_mutex); +mutex_unlock (&uuid_mutex); + }else { +break ; + } } - ret =btrfs_commit_transaction (trans, root); -WARN_ON (ret); -mutex_lock (&uuid_mutex); -/* keep away write_all_supers() during the finishing procedure */ -mutex_lock (&root->fs_info->fs_devices->device_list_mutex); -mutex_lock (&root->fs_info->chunk_mutex);btrfs_dev_replace_lock (dev_replace); dev_replace->replace_state = scrub_ret ? BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED
fs/btrfs/volumes.c +2 -0
@@ -4760,6 +4760,7 @@ static int __btrfs_alloc_chunk(struct btfor (i =0 ; i < map->num_stripes; i++) { num_bytes = map->stripes[i].dev->bytes_used + stripe_size;btrfs_device_set_bytes_used (map->stripes[i].dev, num_bytes); + map->stripes[i].dev->has_pending_chunks = true; }spin_lock (&extent_root->fs_info->free_chunk_lock);
@@ -7064,6 +7065,7 @@ void btrfs_update_commit_device_bytes_usfor (i =0 ; i < map->num_stripes; i++) { dev = map->stripes[i].dev; dev->commit_bytes_used = dev->bytes_used; + dev->has_pending_chunks = false; } }unlock_chunks (root);
fs/btrfs/volumes.h +5 -0
@@ -62,6 +62,11 @@ struct btrfs_device {spinlock_t io_lock____cacheline_aligned ;int running_pending; +/* When true means this device has pending chunk alloc in +* current transaction. Protected by chunk_mutex. +*/ +bool has_pending_chunks; +/* regular prio bios */ struct btrfs_pending_bios pending_bios;/* WRITE_SYNC bios */
Greg Kroah-Hartman
maintainerPATCH 67/73 lib/mpi: Fix karactx leak in mpi_powm
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
commit c8ea9fce2baf7b643384f36f29e4194fa40d33a6 upstream.
Sometimes mpi_powm will leak karactx because a memory allocation failure causes a bail-out that skips the freeing of karactx. This patch moves the freeing of karactx to the end of the function like everything else so that it can't be skipped.
--- lib/mpi/mpi-pow.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
lib/mpi/mpi-pow.c +2 -4
@@ -37,6 +37,7 @@int mpi_powm (MPI res,MPI base,MPI exp,MPI mod) {mpi_ptr_t mp_marker =NULL , bp_marker =NULL , ep_marker =NULL ; +struct karatsuba_ctx karactx = {};mpi_ptr_t xp_marker =NULL ;mpi_ptr_t tspace =NULL ;mpi_ptr_t rp, ep, mp, bp;
@@ -164,13 +165,11 @@ int mpi_powm(MPI res, MPI base, MPI exp,int c;mpi_limb_t e;mpi_limb_t carry_limb; -struct karatsuba_ctx karactx; xp = xp_marker =mpi_alloc_limb_space (2 * (msize +1 ));if (!xp) goto enomem; -memset (&karactx,0 ,sizeof karactx); negative_result = (ep[0 ] &1 ) && base->sign; i = esize -1 ;
@@ -295,8 +294,6 @@ int mpi_powm(MPI res, MPI base, MPI exp,if (mod_shift_cnt)mpihelp_rshift (rp, rp, rsize, mod_shift_cnt);MPN_NORMALIZE (rp, rsize); - -mpihelp_release_karatsuba_ctx (&karactx); }if (negative_result && rsize) {
@@ -313,6 +310,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, leave: rc =0 ; enomem: +mpihelp_release_karatsuba_ctx (&karactx);if (assign_rp)mpi_assign_limb_space (res, rp, size);if (mp_marker)
Greg Kroah-Hartman
maintainerPATCH 70/73 ARC: handle gcc generated __builtin_trap for older compiler
In reply to Greg Kroah-HartmanFrom: Vineet Gupta <[email protected]>
commit af1be2e21203867cb958aaceed5366e2e24b88e8 upstream.
ARC gcc prior to GNU 2018.03 release didn't have a target specific __builtin_trap() implementation, generating default abort() call.
Implement the abort() call - emulating what newer gcc does for the same, as suggested by Arnd.
--- arch/arc/kernel/traps.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arc/kernel/traps.c +8 -0
@@ -155,3 +155,11 @@ void do_insterror_or_kprobe(unsigned loninsterror_is_error (address, regs); } + +/* +* abort() call generated by older gcc for __builtin_trap() +*/ +void abort (void ) +{ + __asm__ __volatile__("trap_s 5\n" ); +}
Greg Kroah-Hartman
maintainerPATCH 71/73 arm64, vdso: Define vdso_{start,end} as array
In reply to Greg Kroah-HartmanCommit dbbb08f500d6146398b794fdc68a8e811366b451 upstream.
Adjust vdso_{start|end} to be char arrays to avoid compile-time analysis that flags "too large" memcmp() calls with CONFIG_FORTIFY_SOURCE.
--- arch/arm64/kernel/vdso.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm64/kernel/vdso.c +5 -5
@@ -36,7 +36,7 @@#include <asm/vdso.h> #include <asm/vdso_datapage.h> -extern char vdso_start, vdso_end; +extern char vdso_start[], vdso_end[];static unsigned long vdso_pages;static struct page **vdso_pagelist;
@@ -115,14 +115,14 @@ static int __init vdso_init(void) {int i; -if (memcmp (&vdso_start,"\177ELF" ,4 )) { +if (memcmp (vdso_start,"\177ELF" ,4 )) {pr_err ("vDSO is not a valid ELF object!\n" );return -EINVAL ; } - vdso_pages = (&vdso_end - &vdso_start) >>PAGE_SHIFT ; + vdso_pages = (vdso_end - vdso_start) >>PAGE_SHIFT ;pr_info ("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n" , - vdso_pages +1 , vdso_pages, &vdso_start,1L , vdso_data); + vdso_pages +1 , vdso_pages, vdso_start,1L , vdso_data);/* Allocate the vDSO pagelist, plus a page for the data. */ vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *),
@@ -135,7 +135,7 @@ static int __init vdso_init(void)/* Grab the vDSO code pages. */ for (i =0 ; i < vdso_pages; i++) - vdso_pagelist[i +1 ] =virt_to_page (&vdso_start + i *PAGE_SIZE ); + vdso_pagelist[i +1 ] =virt_to_page (vdso_start + i *PAGE_SIZE );/* Populate the special mapping structures */ vdso_spec[0 ] = (struct vm_special_mapping ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/73 KVM: x86: degrade WARN to pr_warn_ratelimited
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 3f16a5c318392cbb5a0c7a3d19dff8c8ef3c38ee upstream.
This warning can be triggered easily by userspace, so it should certainly not cause a panic if panic_on_warn is set.
--- arch/x86/kvm/x86.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/x86.c +3 -3
@@ -1293,7 +1293,7 @@ static int set_tsc_khz(struct kvm_vcpu * vcpu->arch.tsc_always_catchup =1 ;return 0 ; }else { -WARN (1 ,"user requested TSC rate below hardware speed\n" ); +pr_warn_ratelimited ("user requested TSC rate below hardware speed\n" );return -1 ; } }
@@ -1303,8 +1303,8 @@ static int set_tsc_khz(struct kvm_vcpu * user_tsc_khz, tsc_khz);if (ratio ==0 || ratio >= kvm_max_tsc_scaling_ratio) { -WARN_ONCE (1 ,"Invalid TSC scaling ratio - virtual-tsc-khz=%u\n" , - user_tsc_khz); +pr_warn_ratelimited ("Invalid TSC scaling ratio - virtual-tsc-khz=%u\n" , + user_tsc_khz);return -1 ; }
Greg Kroah-Hartman
maintainerPATCH 69/73 tty: rocket: fix incorrect forward declaration of rp_init()
In reply to Greg Kroah-Hartman[ Upstream commit 423ea3255424b954947d167681b71ded1b8fca53 ]
Make the forward declaration actually match the real function definition, something that previous versions of gcc had just ignored.
This is another patch to fix new warnings from gcc-9 before I start the merge window pulls. I don't want to miss legitimate new warnings just because my system update brought a new compiler with new warnings.
--- drivers/tty/rocket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/rocket.c +1 -1
@@ -279,7 +279,7 @@ MODULE_PARM_DESC(pc104_3, "set interface types for ISA(PC104) board #3 (e.g. pc1module_param_array (pc104_4, ulong,NULL ,0 );MODULE_PARM_DESC (pc104_4,"set interface types for ISA(PC104) board #4 (e.g. pc104_4=232,232,485,485,..." ); -static int rp_init (void ); +static int __init rp_init (void );static void rp_cleanup_module (void );module_init (rp_init);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/73 9p/rdma: do not disconnect on down_interruptible EAGAIN
In reply to Greg Kroah-Hartman[ Upstream commit 8b894adb2b7e1d1e64b8954569c761eaf3d51ab5 ]
9p/rdma would sometimes drop the connection and display errors in recv_done when the user does ^C.
The errors were caused by recv buffers that were posted at the time of disconnect, and we just do not want to disconnect when down_interruptible is... interrupted.
--- net/9p/trans_rdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/9p/trans_rdma.c +2 -2
@@ -476,7 +476,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req) err =post_recv (client, rpl_context);if (err) { -p9_debug (P9_DEBUG_FCALL ,"POST RECV failed\n" ); +p9_debug (P9_DEBUG_ERROR ,"POST RECV failed: %d\n" , err); goto recv_error; }/* remove posted receive buffer from request structure */
@@ -544,7 +544,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req) recv_error:kfree (rpl_context);spin_lock_irqsave (&rdma->req_lock, flags); -if (rdma->state <P9_RDMA_CLOSING ) { +if (err != -EINTR && rdma->state <P9_RDMA_CLOSING ) { rdma->state =P9_RDMA_CLOSING ;spin_unlock_irqrestore (&rdma->req_lock, flags);rdma_disconnect (rdma->cm_id);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/73 9p: acl: fix uninitialized iattr access
In reply to Greg Kroah-Hartman[ Upstream commit e02a53d92e197706cad1627bd84705d4aa20a145 ]
iattr is passed to v9fs_vfs_setattr_dotl which does send various values from iattr over the wire, even if it tells the server to only look at iattr.ia_valid fields this could leak some stack data.
Addresses-Coverity-ID: 1195601 ("Uninitalized scalar variable")
--- fs/9p/acl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/9p/acl.c +1 -1
@@ -282,7 +282,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,switch (handler->flags) {case ACL_TYPE_ACCESS :if (acl) { -struct iattr iattr; +struct iattr iattr = {0 };struct posix_acl *old_acl = acl; retval =posix_acl_update_mode (inode, &iattr.ia_mode, &acl);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/73 9p: p9dirent_read: check network-provided name length
In reply to Greg Kroah-Hartman[ Upstream commit ef5305f1f72eb1cfcda25c382bb0368509c0385b ]
strcpy to dirent->d_name could overflow the buffer, use strscpy to check the provided string length and error out if the size was too big.
While we are here, make the function return an error when the pdu parsing failed, instead of returning the pdu offset as if it had been a success...
Addresses-Coverity-ID: 139133 ("Copy into fixed size buffer")
--- net/9p/protocol.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/9p/protocol.c +9 -3
@@ -622,13 +622,19 @@ int p9dirent_read(struct p9_client *clnt, char *buf, int len,if (ret) {p9_debug (P9_DEBUG_9P ,"<<< p9dirent_read failed: %d\n" , ret);trace_9p_protocol_dump (clnt, &fake_pdu); - goto out; +return ret; } -strcpy (dirent->d_name, nameptr); + ret =strscpy (dirent->d_name, nameptr,sizeof (dirent->d_name)); +if (ret <0 ) { +p9_debug (P9_DEBUG_ERROR , +"On the wire dirent name too long: %s\n" , + nameptr); +kfree (nameptr); +return ret; + }kfree (nameptr); -out:return fake_pdu.offset; }EXPORT_SYMBOL (p9dirent_read);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/73 net/9p: include trans_common.h to fix missing prototype warning.
In reply to Greg Kroah-Hartman[ Upstream commit 52ad259eaac0454c1ac7123e7148cf8d6e6f5301 ]
This silences -Wmissing-prototypes when defining p9_release_pages.
--- net/9p/trans_common.c | 1 + 1 file changed, 1 insertion(+)
net/9p/trans_common.c +1 -0
@@ -14,6 +14,7 @@#include <linux/mm.h> #include <linux/module.h> +#include "trans_common.h" /** * p9_release_req_pages - Release pages after the transaction.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/73 SMB3: retry on STATUS_INSUFFICIENT_RESOURCES instead of failing write
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
commit 8d526d62db907e786fd88948c75d1833d82bd80e upstream.
Some servers such as Windows 10 will return STATUS_INSUFFICIENT_RESOURCES as the number of simultaneous SMB3 requests grows (even though the client has sufficient credits). Return EAGAIN on STATUS_INSUFFICIENT_RESOURCES so that we can retry writes which fail with this status code.
This (for example) fixes large file copies to Windows 10 on fast networks.
--- fs/cifs/smb2maperror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/smb2maperror.c +1 -1
@@ -455,7 +455,7 @@ static const struct status_to_posix_erro {STATUS_FILE_INVALID, -EIO, "STATUS_FILE_INVALID"}, {STATUS_ALLOTTED_SPACE_EXCEEDED, -EIO, "STATUS_ALLOTTED_SPACE_EXCEEDED"}, - {STATUS_INSUFFICIENT_RESOURCES, -EREMOTEIO, + {STATUS_INSUFFICIENT_RESOURCES, -EAGAIN, "STATUS_INSUFFICIENT_RESOURCES"}, {STATUS_DFS_EXIT_PATH_FOUND, -EIO, "STATUS_DFS_EXIT_PATH_FOUND"}, {STATUS_DEVICE_DATA_ERROR, -EIO, "STATUS_DEVICE_DATA_ERROR"},
Greg Kroah-Hartman
maintainerPATCH 73/73 dmaengine: imx-sdma: remove BD_INTR for channel0
In reply to Greg Kroah-HartmanFrom: Robin Gong <[email protected]>
commit 3f93a4f297961c12bb17aa16cb3a4d1291823cae upstream.
It is possible for an irq triggered by channel0 to be received later after clks are disabled once firmware loaded during sdma probe. If that happens then clearing them by writing to SDMA_H_INTR won't work and the kernel will hang processing infinite interrupts. Actually, don't need interrupt triggered on channel0 since it's pollling SDMA_H_STATSTOP to know channel0 done rather than interrupt in current code, just clear BD_INTR to disable channel0 interrupt to avoid the above case.
This issue was brought by commit 1d069bfa3c78 ("dmaengine: imx-sdma:
ack channel 0 IRQ in the interrupt handler") which didn't take care the above case.
--- drivers/dma/imx-sdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/imx-sdma.c +2 -2
@@ -614,7 +614,7 @@ static int sdma_load_script(struct sdma_spin_lock_irqsave (&sdma->channel_0_lock, flags); bd0->mode.command =C0_SETPM ; - bd0->mode.status =BD_DONE |BD_INTR |BD_WRAP |BD_EXTD ; + bd0->mode.status =BD_DONE |BD_WRAP |BD_EXTD ; bd0->mode.count = size /2 ; bd0->buffer_addr = buf_phys; bd0->ext_buffer_addr = address;
@@ -883,7 +883,7 @@ static int sdma_load_context(struct sdma context->gReg[7 ] = sdmac->watermark_level; bd0->mode.command =C0_SETDM ; - bd0->mode.status =BD_DONE |BD_INTR |BD_WRAP |BD_EXTD ; + bd0->mode.status =BD_DONE |BD_WRAP |BD_EXTD ; bd0->mode.count =sizeof (*context) /4 ; bd0->buffer_addr = sdma->context_phys; bd0->ext_buffer_addr =2048 + (sizeof (*context) /4 ) * channel;
Greg Kroah-Hartman
maintainerPATCH 33/73 9p/rdma: remove useless check in cm_event_handler
In reply to Greg Kroah-Hartman[ Upstream commit 473c7dd1d7b59ff8f88a5154737e3eac78a96e5b ]
the client c is always dereferenced to get the rdma struct, so c has to be a valid pointer at this point.
Gcc would optimize that away but let's make coverity happy...
Addresses-Coverity-ID: 102778 ("Dereference before null check")
--- net/9p/trans_rdma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/9p/trans_rdma.c +1 -2
@@ -255,8 +255,7 @@ p9_cm_event_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)case RDMA_CM_EVENT_DISCONNECTED :if (rdma) rdma->state =P9_RDMA_CLOSED ; -if (c) - c->status = Disconnected; + c->status = Disconnected;break ;case RDMA_CM_EVENT_TIMEWAIT_EXIT :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/73 mfd: omap-usb-tll: Fix register offsets
In reply to Greg Kroah-Hartman[ Upstream commit 993dc737c0996c163325961fb62a0ed9fd0308b4 ]
gcc-8 notices that the register number calculation is wrong when the offset is an 'u8' but the number is larger than 256:
drivers/mfd/omap-usb-tll.c: In function 'omap_tll_init':drivers/mfd/omap-usb-tll.c:90:46: error: overflow in conversion from 'int' to 'u8 {aka unsigned char}' chages value from 'i * 256 + 2070' to '22' [-Werror=overflow]
This addresses it by always using a 32-bit offset number for the register. This is apparently an old problem that previous compilers did not find.
--- drivers/mfd/omap-usb-tll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mfd/omap-usb-tll.c +2 -2
@@ -129,12 +129,12 @@ static inline u32 usbtll_read(void __iomem *base, u32 reg)return readl_relaxed (base + reg); } -static inline void usbtll_writeb (void __iomem *base,u8 reg,u8 val) +static inline void usbtll_writeb (void __iomem *base,u32 reg,u8 val) {writeb_relaxed (val, base + reg); } -static inline u8 usbtll_readb (void __iomem *base,u8 reg) +static inline u8 usbtll_readb (void __iomem *base,u32 reg) {return readb_relaxed (base + reg); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/73 ARC: fix build warning in elf.h
In reply to Greg Kroah-Hartman[ Upstream commit 1dec78585328db00e33fb18dc1a6deed0e2095a5 ]
The cast valid since TASK_SIZE * 2 will never actually cause overflow.
| CC fs/binfmt_elf.o | In file included from ../include/linux/elf.h:4:0, | from ../include/linux/module.h:15, | from ../fs/binfmt_elf.c:12: | ../fs/binfmt_elf.c: In function load_elf_binar: | ../arch/arc/include/asm/elf.h:57:29: warning: integer overflow in expression [-Woverflow] | #define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) | ^ | ../fs/binfmt_elf.c:921:16: note: in expansion of macro ELF_ET_DYN_BASE | load_bias = ELF_ET_DYN_BASE - vaddr;
--- arch/arc/include/asm/elf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arc/include/asm/elf.h +1 -1
@@ -55,7 +55,7 @@ extern int elf_check_arch(const struct elf32_hdr *);* the loader. We need to make sure that it is out of the way of the program * that it will "exec", and that there is sufficient room for the brk. */ -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) +#define ELF_ET_DYN_BASE (2UL * TASK_SIZE / 3)/* * When the program starts, a1 contains a pointer to a function to be
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/73 spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
In reply to Greg Kroah-Hartman[ Upstream commit 5caaf29af5ca82d5da8bc1d0ad07d9e664ccf1d8 ]
If spi_register_master fails in spi_bitbang_start because device_add failure, We should return the error code other than 0, otherwise calling spi_bitbang_stop may trigger NULL pointer dereference like this:
BUG: KASAN: null-ptr-deref in __list_del_entry_valid+0x45/0xd0 Read of size 8 at addr 0000000000000000 by task syz-executor.0/3661 CPU: 0 PID: 3661 Comm: syz-executor.0 Not tainted 5.1.0+ #28 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 Call Trace: dump_stack+0xa9/0x10e ? __list_del_entry_valid+0x45/0xd0 ? __list_del_entry_valid+0x45/0xd0 __kasan_report+0x171/0x18d ? __list_del_entry_valid+0x45/0xd0 kasan_report+0xe/0x20 __list_del_entry_valid+0x45/0xd0 spi_unregister_controller+0x99/0x1b0 spi_lm70llp_attach+0x3ae/0x4b0 [spi_lm70llp] ? 0xffffffffc1128000 ? klist_next+0x131/0x1e0 ? driver_detach+0x40/0x40 [parport] port_check+0x3b/0x50 [parport] bus_for_each_dev+0x115/0x180 ? subsys_dev_iter_exit+0x20/0x20 __parport_register_driver+0x1f0/0x210 [parport] ? 0xffffffffc1150000 do_one_initcall+0xb9/0x3b5 ? perf_trace_initcall_level+0x270/0x270 ? kasan_unpoison_shadow+0x30/0x40 ? kasan_unpoison_shadow+0x30/0x40 do_init_module+0xe0/0x330 load_module+0x38eb/0x4270 ? module_frob_arch_sections+0x20/0x20 ? kernel_read_file+0x188/0x3f0 ? find_held_lock+0x6d/0xd0 ? fput_many+0x1a/0xe0 ? __do_sys_finit_module+0x162/0x190 __do_sys_finit_module+0x162/0x190 ? __ia32_sys_init_module+0x40/0x40 ? __mutex_unlock_slowpath+0xb4/0x3f0 ? wait_for_completion+0x240/0x240 ? vfs_write+0x160/0x2a0 ? lockdep_hardirqs_off+0xb5/0x100 ? mark_held_locks+0x1a/0x90 ? do_syscall_64+0x14/0x2a0 do_syscall_64+0x72/0x2a0 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- drivers/spi/spi-bitbang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-bitbang.c +1 -1
@@ -392,7 +392,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)if (ret)spi_master_put (master); -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (spi_bitbang_start);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/73 Bluetooth: Fix faulty expression for minimum encryption key size check
In reply to Greg Kroah-HartmanFrom: Matias Karhumaa <[email protected]>
commit eca94432934fe5f141d084f2e36ee2c0e614cc04 upstream.
Fix minimum encryption key size check so that HCI_MIN_ENC_KEY_SIZE is also allowed as stated in the comment.
This bug caused connection problems with devices having maximum encryption key size of 7 octets (56-bit).
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203997
--- net/bluetooth/l2cap_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +1 -1
@@ -1341,7 +1341,7 @@ static bool l2cap_check_enc_key_size(str* actually encrypted before enforcing a key size. */ return (!test_bit (HCI_CONN_ENCRYPT , &hcon->flags) || - hcon->enc_key_size >HCI_MIN_ENC_KEY_SIZE ); + hcon->enc_key_size >=HCI_MIN_ENC_KEY_SIZE ); }static void l2cap_do_start (struct l2cap_chan *chan)
Greg Kroah-Hartman
maintainerPATCH 42/73 tipc: check msg->req data len in tipc_nl_compat_bearer_disable
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit 4f07b80c973348a99b5d2a32476a2e7877e94a05 ]
This patch is to fix an uninit-value issue, reported by syzbot:
BUG: KMSAN: uninit-value in memchr+0xce/0x110 lib/string.c:981
Call Trace:
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0x191/0x1f0 lib/dump_stack.c:113
kmsan_report+0x130/0x2a0 mm/kmsan/kmsan.c:622
__msan_warning+0x75/0xe0 mm/kmsan/kmsan_instr.c:310
memchr+0xce/0x110 lib/string.c:981
string_is_valid net/tipc/netlink_compat.c:176 [inline]
tipc_nl_compat_bearer_disable+0x2a1/0x480 net/tipc/netlink_compat.c:449
__tipc_nl_compat_doit net/tipc/netlink_compat.c:327 [inline]
tipc_nl_compat_doit+0x3ac/0xb00 net/tipc/netlink_compat.c:360
tipc_nl_compat_handle net/tipc/netlink_compat.c:1178 [inline]
tipc_nl_compat_recv+0x1b1b/0x27b0 net/tipc/netlink_compat.c:1281TLV_GET_DATA_LEN() may return a negtive int value, which will be used as size_t (becoming a big unsigned long) passed into memchr, cause this issue.
Similar to what it does in tipc_nl_compat_bearer_enable(), this fix is to return -EINVAL when TLV_GET_DATA_LEN() is negtive in tipc_nl_compat_bearer_disable(), as well as in tipc_nl_compat_link_stat_dump() and tipc_nl_compat_link_reset_stats().
v1->v2:
- add the missing Fixes tags per Eric's request.
--- net/tipc/netlink_compat.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
net/tipc/netlink_compat.c +15 -3
@@ -430,7 +430,11 @@ static int tipc_nl_compat_bearer_disableif (!bearer)return -EMSGSIZE ; - len =min_t (int,TLV_GET_DATA_LEN (msg->req),TIPC_MAX_BEARER_NAME ); + len =TLV_GET_DATA_LEN (msg->req); +if (len <=0 ) +return -EINVAL ; + + len =min_t (int, len,TIPC_MAX_BEARER_NAME );if (!string_is_valid (name, len))return -EINVAL ;
@@ -505,7 +509,11 @@ static int tipc_nl_compat_link_stat_dump name = (char *)TLV_DATA (msg->req); - len =min_t (int,TLV_GET_DATA_LEN (msg->req),TIPC_MAX_LINK_NAME ); + len =TLV_GET_DATA_LEN (msg->req); +if (len <=0 ) +return -EINVAL ; + + len =min_t (int, len,TIPC_MAX_BEARER_NAME );if (!string_is_valid (name, len))return -EINVAL ;
@@ -776,7 +784,11 @@ static int tipc_nl_compat_link_reset_staif (!link)return -EMSGSIZE ; - len =min_t (int,TLV_GET_DATA_LEN (msg->req),TIPC_MAX_LINK_NAME ); + len =TLV_GET_DATA_LEN (msg->req); +if (len <=0 ) +return -EINVAL ; + + len =min_t (int, len,TIPC_MAX_BEARER_NAME );if (!string_is_valid (name, len))return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 40/73 sctp: change to hold sk after auth shkey is created successfully
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit 25bff6d5478b2a02368097015b7d8eb727c87e16 ]
Now in sctp_endpoint_init(), it holds the sk then creates auth shkey. But when the creation fails, it doesn't release the sk, which causes a sk defcnf leak,
Here to fix it by only holding the sk when auth shkey is created successfully.
--- net/sctp/endpointola.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/sctp/endpointola.c +4 -4
@@ -126,10 +126,6 @@ static struct sctp_endpoint *sctp_endpoi/* Initialize the bind addr area */ sctp_bind_addr_init (&ep->base.bind_addr,0 ); -/* Remember who we are attached to. */ - ep->base.sk = sk; -sock_hold (ep->base.sk); -/* Create the lists of associations. */ INIT_LIST_HEAD (&ep->asocs);
@@ -165,6 +161,10 @@ static struct sctp_endpoint *sctp_endpoi ep->auth_hmacs_list = auth_hmacs; ep->auth_chunk_list = auth_chunks; +/* Remember who we are attached to. */ + ep->base.sk = sk; +sock_hold (ep->base.sk); +return ep; nomem_hmacs:
Greg Kroah-Hartman
maintainerPATCH 7/73 Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD
In reply to Greg Kroah-HartmanFrom: Andrey Smirnov <[email protected]>
commit 7c7da40da1640ce6814dab1e8031b44e19e5a3f6 upstream.
In the case of compat syscall ioctl numbers for UI_BEGIN_FF_UPLOAD and UI_END_FF_UPLOAD need to be adjusted before being passed on uinput_ioctl_handler() since code built with -m32 will be passing slightly different values. Extend the code already covering UI_SET_PHYS to cover UI_BEGIN_FF_UPLOAD and UI_END_FF_UPLOAD as well.
--- drivers/input/misc/uinput.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
drivers/input/misc/uinput.c +20 -2
@@ -894,13 +894,31 @@ static long uinput_ioctl(struct file *fi#ifdef CONFIG_COMPAT -#define UI_SET_PHYS_COMPAT _IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t) +/* +* These IOCTLs change their size and thus their numbers between +* 32 and 64 bits. +*/ +#define UI_SET_PHYS_COMPAT \ + _IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t) +#define UI_BEGIN_FF_UPLOAD_COMPAT \ + _IOWR(UINPUT_IOCTL_BASE, 200, struct uinput_ff_upload_compat) +#define UI_END_FF_UPLOAD_COMPAT \ + _IOW(UINPUT_IOCTL_BASE, 201, struct uinput_ff_upload_compat)static long uinput_compat_ioctl (struct file *file,unsigned int cmd,unsigned long arg) { -if (cmd ==UI_SET_PHYS_COMPAT ) +switch (cmd) { +case UI_SET_PHYS_COMPAT : cmd =UI_SET_PHYS ; +break ; +case UI_BEGIN_FF_UPLOAD_COMPAT : + cmd =UI_BEGIN_FF_UPLOAD ; +break ; +case UI_END_FF_UPLOAD_COMPAT : + cmd =UI_END_FF_UPLOAD ; +break ; + }return uinput_ioctl_handler (file, cmd, arg,compat_ptr (arg)); }
Greg Kroah-Hartman
maintainerPATCH 5/73 gcc-9: silence address-of-packed-member warning
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
commit 6f303d60534c46aa1a239f29c321f95c83dda748 upstream.
We already did this for clang, but now gcc has that warning too. Yes, yes, the address may be unaligned. And that's kind of the point.
--- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
@@ -636,6 +636,7 @@ KBUILD_CFLAGS += $(call cc-disable-warni KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation) KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context) +KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias) ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
@@ -712,7 +713,6 @@ ifeq ($(cc-name),clang) KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,) KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier) KBUILD_CFLAGS += $(call cc-disable-warning, gnu) -KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) # Quiet clang warning: comparison of unsigned expression < 0 is always false KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare) # CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
Greg Kroah-Hartman
maintainerPATCH 23/73 ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
commit b25af2ff7c07bd19af74e3f64ff82e2880d13d81 upstream.
Since commit 1e434b703248 ("ARM: imx: update the cpu power up timing setting on i.mx6sx") some characters loss is noticed on i.MX6ULL UART as reported by Christoph Niedermaier.
The intention of such commit was to increase the SW2ISO field for i.MX6SX only, but since cpuidle-imx6sx is also used on i.MX6UL/i.MX6ULL this caused unintended side effects on other SoCs.
Fix this problem by keeping the original SW2ISO value for i.MX6UL/i.MX6ULL and only increase SW2ISO in the i.MX6SX case.
--- arch/arm/mach-imx/cpuidle-imx6sx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-imx/cpuidle-imx6sx.c +2 -1
@@ -14,6 +14,7 @@#include "common.h" #include "cpuidle.h" +#include "hardware.h" static int imx6sx_idle_finish (unsigned long val) {
@@ -97,7 +98,7 @@ int __init imx6sx_cpuidle_init(void)* except for power up sw2iso which need to be * larger than LDO ramp up time. */ -imx_gpc_set_arm_power_up_timing (0xf ,1 ); +imx_gpc_set_arm_power_up_timing (cpu_is_imx6sx () ?0xf :0x2 ,1 );imx_gpc_set_arm_power_down_timing (1 ,1 );return cpuidle_register (&imx6sx_cpuidle_driver,NULL );
stable-rc/linux-4.4.y boot: 100 boots: 4 failed, 95 passed with 1 conflict (v4.4.184-73-g71b130d46805)
stable-rc/linux-4.4.y boot: 100 boots: 4 failed, 95 passed with 1 conflict (v4.4.184-73-g71b130d46805)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.4.y/kernel/v4.4.184-73-g71b130d46805/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.4.y/kernel/v4.4.184-73-g71b130d46805/
Tree: stable-rc
Branch: linux-4.4.y
Git Describe: v4.4.184-73-g71b130d46805
Git Commit: 71b130d468055291345db697052e5256d6e46397
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 46 unique boards, 20 SoC families, 14 builds out of 190
Boot Failures Detected:
arm:
sunxi_defconfig:
gcc-8:
sun7i-a20-bananapi: 1 failed lab
multi_v7_defconfig:
gcc-8:
stih410-b2120: 1 failed lab
sun7i-a20-bananapi: 1 failed labarm64:
defconfig:
gcc-8:
qcom-qdf2400: 1 failed labConflicting Boot Failure Detected: (These likely are not failures as other labs are reporting PASS. Needs review.)
x86_64:
x86_64_defconfig:
qemu:
lab-drue: PASS (gcc-8)
lab-baylibre: FAIL (gcc-8)
lab-mhart: PASS (gcc-8)
lab-collabora: PASS (gcc-8)
lab-linaro-lkft: PASS (gcc-8)
---
For more info write to <[email protected]>
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.185 release. There are 73 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 Wed 10 Jul 2019 03:03:52 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.185-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
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.185 release. There are 73 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 Wed 10 Jul 2019 03:03:52 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.185-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
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.4.185-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: 1ef1d6e05dcd8a34ef188796843b380d0d4e4408
git describe: v4.4.184-74-g1ef1d6e05dcd
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.4-oe/build/v4.4.184-74-g1ef1d6e05dcd
No regressions (compared to build v4.4.184)
No fixes (compared to build v4.4.184)
Ran 13253 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
* kvm-unit-tests
* 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
* spectre-meltdown-checker-test
* v4l2-compliance
* install-android-platform-tools-r2600
Summary
------------------------------------------------------------------------
kernel: 4.4.185-rc1
git repo: https://git.linaro.org/lkft/arm64-stable-rc.git
git branch: 4.4.185-rc1-hikey-20190708-490
git commit: 3eb4ca56f74f0d93a73c81efd51db5765842bd1b
git describe: 4.4.185-rc1-hikey-20190708-490
Test details: https://qa-reports.linaro.org/lkft/linaro-hikey-stable-rc-4.4-oe/build/4.4.185-rc1-hikey-20190708-490
No regressions (compared to build 4.4.185-rc1-hikey-20190708-489)
No fixes (compared to build 4.4.185-rc1-hikey-20190708-489)
Ran 148 total tests in the following environments and test suites.
Environments
--------------
- hi6220-hikey - arm64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* libhugetlbfs
* ltp-containers-tests
* ltp-ipc-tests
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.185 release. There are 73 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 Wed 10 Jul 2019 03:03:52 PM UTC. Anything received after that time might be too late.
Build results:
total: 170 pass: 170 fail: 0 Qemu test results: total: 307 pass: 307 fail: 0
Guenter
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.4.185 release. There are 73 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 Wed 10 Jul 2019 03:03:52 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.185-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.185-rc1-g1ef1d6e05dcd
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra30-cardhu-a04
Cheers
Jon
Signature · 1 line
nvpublic