ima: always return negative code for error
Subsystems (18)
Sasha Levin
maintainerPATCH 1/43 ima: always return negative code for error
From: Sascha Hauer <[email protected]>
[ Upstream commit f5e1040196dbfe14c77ce3dfe3b7b08d2d961e88 ]
integrity_kernel_read() returns the number of bytes read. If this is a short read then this positive value is returned from ima_calc_file_hash_atfm(). Currently this is only indirectly called from ima_calc_file_hash() and this function only tests for the return value being zero or nonzero and also doesn't forward the return value. Nevertheless there's no point in returning a positive value as an error, so translate a short read into -EINVAL.
--- security/integrity/ima/ima_crypto.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
security/integrity/ima/ima_crypto.c +4 -1
@@ -271,8 +271,11 @@ static int ima_calc_file_hash_atfm(struct file *file, rbuf_len =min_t (loff_t, i_size - offset, rbuf_size[active]); rc =integrity_kernel_read (file, offset, rbuf[active], rbuf_len); -if (rc != rbuf_len) +if (rc != rbuf_len) { +if (rc >=0 ) + rc = -EINVAL ; goto out3; + }if (rbuf[1 ] && offset) {/* Using two buffers, and it is not the first
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/43 ima: fix freeing ongoing ahash_request
From: Sascha Hauer <[email protected]>
[ Upstream commit 4ece3125f21b1d42b84896c5646dbf0e878464e1 ]
integrity_kernel_read() can fail in which case we forward to call ahash_request_free() on a currently running request. We have to wait for its completion before we can free the request.
This was observed by interrupting a "find / -type f -xdev -print0 | xargs -0 cat 1>/dev/null" with ctrl-c on an IMA enabled filesystem.
--- security/integrity/ima/ima_crypto.c | 5 +++++ 1 file changed, 5 insertions(+)
security/integrity/ima/ima_crypto.c +5 -0
@@ -274,6 +274,11 @@ static int ima_calc_file_hash_atfm(struct file *file,if (rc != rbuf_len) {if (rc >=0 ) rc = -EINVAL ; +/* +* Forward current rc, do not overwrite with return value +* from ahash_wait() +*/ +ahash_wait (ahash_rc, &wait); goto out3; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/43 fs: nfs: Fix possible null-pointer dereferences in encode_attrs()
In reply to Sasha LevinFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit e2751463eaa6f9fec8fea80abbdc62dbc487b3c5 ]
In encode_attrs(), there is an if statement on line 1145 to check whether label is NULL:
if (label && (attrmask[2] & FATTR4_WORD2_SECURITY_LABEL))
When label is NULL, it is used on lines 1178-1181:
*p++ = cpu_to_be32(label->lfs);
*p++ = cpu_to_be32(label->pi);
*p++ = cpu_to_be32(label->len);
p = xdr_encode_opaque_fixed(p, label->label, label->len);To fix these bugs, label is checked before being used.
These bugs are found by a static analysis tool STCheck written by us.
--- fs/nfs/nfs4xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4xdr.c +1 -1
@@ -1171,7 +1171,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, }else *p++ =cpu_to_be32 (NFS4_SET_TO_SERVER_TIME ); } -if (bmval[2 ] &FATTR4_WORD2_SECURITY_LABEL ) { +if (label && (bmval[2 ] &FATTR4_WORD2_SECURITY_LABEL )) { *p++ =cpu_to_be32 (label->lfs); *p++ =cpu_to_be32 (label->pi); *p++ =cpu_to_be32 (label->len);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/43 9p: Transport error uninitialized
In reply to Sasha LevinFrom: Lu Shuaibing <[email protected]>
[ Upstream commit 0ce772fe79b68f83df40f07f28207b292785c677 ]
The p9_tag_alloc() does not initialize the transport error t_err field. The struct p9_req_t *req is allocated and stored in a struct p9_client variable. The field t_err is never initialized before p9_conn_cancel() checks its value.
KUMSAN(KernelUninitializedMemorySantizer, a new error detection tool) reports this bug.
==================================================================
BUG: KUMSAN: use of uninitialized memory in p9_conn_cancel+0x2d9/0x3b0 Read of size 4 at addr ffff88805f9b600c by task kworker/1:2/1216 CPU: 1 PID: 1216 Comm: kworker/1:2 Not tainted 5.2.0-rc4+ #28 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Ubuntu-1.8.2-1ubuntu1 04/01/2014 Workqueue: events p9_write_work Call Trace: dump_stack+0x75/0xae __kumsan_report+0x17c/0x3e6 kumsan_report+0xe/0x20 p9_conn_cancel+0x2d9/0x3b0 p9_write_work+0x183/0x4a0 process_one_work+0x4d1/0x8c0 worker_thread+0x6e/0x780 kthread+0x1ca/0x1f0 ret_from_fork+0x35/0x40 Allocated by task 1979: save_stack+0x19/0x80 __kumsan_kmalloc.constprop.3+0xbc/0x120 kmem_cache_alloc+0xa7/0x170 p9_client_prepare_req.part.9+0x3b/0x380 p9_client_rpc+0x15e/0x880 p9_client_create+0x3d0/0xac0 v9fs_session_init+0x192/0xc80 v9fs_mount+0x67/0x470 legacy_get_tree+0x70/0xd0 vfs_get_tree+0x4a/0x1c0 do_mount+0xba9/0xf90 ksys_mount+0xa8/0x120 __x64_sys_mount+0x62/0x70 do_syscall_64+0x6d/0x1e0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Freed by task 0:
(stack is not available)
The buggy address belongs to the object at ffff88805f9b6008 which belongs to the cache p9_req_t of size 144 The buggy address is located 4 bytes inside of 144-byte region [ffff88805f9b6008, ffff88805f9b6098) The buggy address belongs to the page: page:ffffea00017e6d80 refcount:1 mapcount:0 mapping:ffff888068b63740 index:0xffff88805f9b7d90 compound_mapcount: 0 flags: 0x100000000010200(slab|head) raw: 0100000000010200 ffff888068b66450 ffff888068b66450 ffff888068b63740 raw: ffff88805f9b7d90 0000000000100001 00000001ffffffff 0000000000000000 page dumped because: kumsan: bad access detected ==================================================================
--- net/9p/client.c | 1 + 1 file changed, 1 insertion(+)
net/9p/client.c +1 -0
@@ -296,6 +296,7 @@ p9_tag_alloc(struct p9_client *c, int8_t type, unsigned int max_size)p9pdu_reset (&req->tc);p9pdu_reset (&req->rc); + req->t_err =0 ; req->status =REQ_STATUS_ALLOC ;init_waitqueue_head (&req->wq);INIT_LIST_HEAD (&req->req_list);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/43 9p: avoid attaching writeback_fid on mmap with type PRIVATE
In reply to Sasha LevinFrom: Chengguang Xu <[email protected]>
[ Upstream commit c87a37ebd40b889178664c2c09cc187334146292 ]
Currently on mmap cache policy, we always attach writeback_fid whether mmap type is SHARED or PRIVATE. However, in the use case of kata-container which combines 9p(Guest OS) with overlayfs(Host OS), this behavior will trigger overlayfs' copy-up when excute command inside container.
--- fs/9p/vfs_file.c | 3 +++ 1 file changed, 3 insertions(+)
fs/9p/vfs_file.c +3 -0
@@ -528,6 +528,7 @@ v9fs_mmap_file_mmap(struct file *filp, struct vm_area_struct *vma) v9inode =V9FS_I (inode);mutex_lock (&v9inode->v_mutex);if (!v9inode->writeback_fid && + (vma->vm_flags &VM_SHARED ) && (vma->vm_flags &VM_WRITE )) {/* * clone a fid and add it to writeback_fid
@@ -629,6 +630,8 @@ static void v9fs_mmap_vm_close(struct vm_area_struct *vma) (vma->vm_end - vma->vm_start - 1), }; +if (!(vma->vm_flags &VM_SHARED )) +return ;p9_debug (P9_DEBUG_VFS ,"9p VMA close, %p, flushing" , vma);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/43 9p/cache.c: Fix memory leak in v9fs_cache_session_get_cookie
In reply to Sasha LevinFrom: Bharath Vedartham <[email protected]>
[ Upstream commit 962a991c5de18452d6c429d99f3039387cf5cbb0 ]
v9fs_cache_session_get_cookie assigns a random cachetag to v9ses->cachetag, if the cachetag is not assigned previously.
v9fs_random_cachetag allocates memory to v9ses->cachetag with kmalloc and uses scnprintf to fill it up with a cachetag.
But if scnprintf fails, v9ses->cachetag is not freed in the current code causing a memory leak.
Fix this by freeing v9ses->cachetag it v9fs_random_cachetag fails.
This was reported by syzbot, the link to the report is below:
https://syzkaller.appspot.com/bug?id=f012bdf297a7a4c860c38a88b44fbee43fd9bbf3
--- fs/9p/cache.c | 2 ++ 1 file changed, 2 insertions(+)
fs/9p/cache.c +2 -0
@@ -66,6 +66,8 @@ void v9fs_cache_session_get_cookie(struct v9fs_session_info *v9ses)if (!v9ses->cachetag) {if (v9fs_random_cachetag (v9ses) <0 ) { v9ses->fscache =NULL ; +kfree (v9ses->cachetag); + v9ses->cachetag =NULL ;return ; } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/43 xen/pci: reserve MCFG areas earlier
In reply to Sasha LevinFrom: Igor Druzhinin <[email protected]>
[ Upstream commit a4098bc6eed5e31e0391bcc068e61804c98138df ]
If MCFG area is not reserved in E820, Xen by default will defer its usage until Dom0 registers it explicitly after ACPI parser recognizes it as a reserved resource in DSDT. Having it reserved in E820 is not mandatory according to "PCI Firmware Specification, rev 3.2" (par. 4.1.2) and firmware is free to keep a hole in E820 in that place. Xen doesn't know what exactly is inside this hole since it lacks full ACPI view of the platform therefore it's potentially harmful to access MCFG region without additional checks as some machines are known to provide inconsistent information on the size of the region.
Now xen_mcfg_late() runs after acpi_init() which is too late as some basic PCI enumeration starts exactly there as well. Trying to register a device prior to MCFG reservation causes multiple problems with PCIe extended capability initializations in Xen (e.g. SR-IOV VF BAR sizing). There are no convenient hooks for us to subscribe to so register MCFG areas earlier upon the first invocation of xen_add_device(). It should be safe to do once since all the boot time buses must have their MCFG areas in MCFG table already and we don't support PCI bus hot-plug.
--- drivers/xen/pci.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/xen/pci.c +15 -6
@@ -29,6 +29,8 @@#include "../pci/pci.h" #ifdef CONFIG_PCI_MMCONFIG #include <asm/pci_x86.h> + +static int xen_mcfg_late (void );#endif static bool __read_mostly pci_seg_supported = true;
@@ -40,7 +42,18 @@ static int xen_add_device(struct device *dev)#ifdef CONFIG_PCI_IOV struct pci_dev *physfn = pci_dev->physfn;#endif - +#ifdef CONFIG_PCI_MMCONFIG +static bool pci_mcfg_reserved = false; +/* +* Reserve MCFG areas in Xen on first invocation due to this being +* potentially called from inside of acpi_init immediately after +* MCFG table has been finally parsed. +*/ +if (!pci_mcfg_reserved) { +xen_mcfg_late (); + pci_mcfg_reserved = true; + } +#endif if (pci_seg_supported) {struct {struct physdev_pci_device_add add;
@@ -213,7 +226,7 @@ static int __init register_xen_pci_notifier(void)arch_initcall (register_xen_pci_notifier);#ifdef CONFIG_PCI_MMCONFIG -static int __init xen_mcfg_late (void ) +static int xen_mcfg_late (void ) {struct pci_mmcfg_region *cfg;int rc;
@@ -252,8 +265,4 @@ static int __init xen_mcfg_late(void) }return 0 ; } -/* -* Needs to be done after acpi_init which are subsys_initcall. -*/ -subsys_initcall_sync (xen_mcfg_late);#endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/43 ceph: fix directories inode i_blkbits initialization
In reply to Sasha LevinFrom: Luis Henriques <[email protected]>
[ Upstream commit 750670341a24cb714e624e0fd7da30900ad93752 ]
When filling an inode with info from the MDS, i_blkbits is being initialized using fl_stripe_unit, which contains the stripe unit in bytes. Unfortunately, this doesn't make sense for directories as they have fl_stripe_unit set to '0'. This means that i_blkbits will be set to 0xff, causing an UBSAN undefined behaviour in i_blocksize():
UBSAN: Undefined behaviour in ./include/linux/fs.h:731:12 shift exponent 255 is too large for 32-bit type 'int'
Fix this by initializing i_blkbits to CEPH_BLOCK_SHIFT if fl_stripe_unit is zero.
--- fs/ceph/inode.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/ceph/inode.c +6 -1
@@ -804,7 +804,12 @@ static int fill_inode(struct inode *inode, struct page *locked_page,/* update inode */ inode->i_rdev =le32_to_cpu (info->rdev); - inode->i_blkbits =fls (le32_to_cpu (info->layout.fl_stripe_unit)) -1 ; +/* directories have fl_stripe_unit set to zero */ +if (le32_to_cpu (info->layout.fl_stripe_unit)) + inode->i_blkbits = +fls (le32_to_cpu (info->layout.fl_stripe_unit)) -1 ; +else + inode->i_blkbits =CEPH_BLOCK_SHIFT ;__ceph_update_quota (ci, iinfo->max_bytes, iinfo->max_files);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/43 ceph: reconnect connection if session hang in opening state
In reply to Sasha LevinFrom: Erqi Chen <[email protected]>
[ Upstream commit 71a228bc8d65900179e37ac309e678f8c523f133 ]
If client mds session is evicted in CEPH_MDS_SESSION_OPENING state, mds won't send session msg to client, and delayed_work skip CEPH_MDS_SESSION_OPENING state session, the session hang forever.
Allow ceph_con_keepalive to reconnect a session in OPENING to avoid session hang. Also, ensure that we skip sessions in RESTARTING and REJECTED states since those states can't be resurrected by issuing a keepalive.
--- fs/ceph/mds_client.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/ceph/mds_client.c +3 -1
@@ -3640,7 +3640,9 @@ static void delayed_work(struct work_struct *work)pr_info ("mds%d hung\n" , s->s_mds); } } -if (s->s_state <CEPH_MDS_SESSION_OPEN ) { +if (s->s_state ==CEPH_MDS_SESSION_NEW || + s->s_state ==CEPH_MDS_SESSION_RESTARTING || + s->s_state ==CEPH_MDS_SESSION_REJECTED ) {/* this mds is failed or recovering, just wait */ ceph_put_mds_session (s);continue ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/43 rbd: fix response length parameter for encoded strings
In reply to Sasha LevinFrom: Dongsheng Yang <[email protected]>
[ Upstream commit 5435d2069503e2aa89c34a94154f4f2fa4a0c9c4 ]
rbd_dev_image_id() allocates space for length but passes a smaller value to rbd_obj_method_sync(). rbd_dev_v2_object_prefix() doesn't allocate space for length. Fix both to be consistent.
--- drivers/block/rbd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/block/rbd.c +6 -4
@@ -4510,17 +4510,20 @@ static int rbd_dev_v2_image_size(struct rbd_device *rbd_dev)static int rbd_dev_v2_object_prefix (struct rbd_device *rbd_dev) { +size_t size;void *reply_buf;int ret;void *p; - reply_buf =kzalloc (RBD_OBJ_PREFIX_LEN_MAX ,GFP_KERNEL ); +/* Response will be an encoded string, which includes a length */ + size =sizeof (__le32) +RBD_OBJ_PREFIX_LEN_MAX ; + reply_buf =kzalloc (size,GFP_KERNEL );if (!reply_buf)return -ENOMEM ; ret =rbd_obj_method_sync (rbd_dev, &rbd_dev->header_oid, &rbd_dev->header_oloc,"get_object_prefix" , -NULL ,0 , reply_buf,RBD_OBJ_PREFIX_LEN_MAX ); +NULL ,0 , reply_buf, size);dout ("%s: rbd_obj_method_sync returned %d\n" , __func__, ret);if (ret <0 ) goto out;
@@ -5489,7 +5492,6 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)dout ("rbd id object name is %s\n" , oid.name);/* Response will be an encoded string, which includes a length */ - size =sizeof (__le32) +RBD_IMAGE_ID_LEN_MAX ; response =kzalloc (size,GFP_NOIO );if (!response) {
@@ -5501,7 +5503,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev) ret =rbd_obj_method_sync (rbd_dev, &oid, &rbd_dev->header_oloc,"get_id" ,NULL ,0 , - response,RBD_IMAGE_ID_LEN_MAX ); + response, size);dout ("%s: rbd_obj_method_sync returned %d\n" , __func__, ret);if (ret == -ENOENT ) { image_id =kstrdup ("" ,GFP_KERNEL );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/43 watchdog: aspeed: Add support for AST2600
In reply to Sasha LevinFrom: Ryan Chen <[email protected]>
[ Upstream commit b3528b4874480818e38e4da019d655413c233e6a ]
The ast2600 can be supported by the same code as the ast2500.
--- drivers/watchdog/aspeed_wdt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/watchdog/aspeed_wdt.c +3 -1
@@ -38,6 +38,7 @@ static const struct aspeed_wdt_config ast2500_config = {static const struct of_device_id aspeed_wdt_of_table[] = { { .compatible ="aspeed,ast2400-wdt" , .data = &ast2400_config }, { .compatible ="aspeed,ast2500-wdt" , .data = &ast2500_config }, + { .compatible ="aspeed,ast2600-wdt" , .data = &ast2500_config }, { }, };MODULE_DEVICE_TABLE (of, aspeed_wdt_of_table);
@@ -264,7 +265,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev)set_bit (WDOG_HW_RUNNING , &wdt->wdd.status); } -if (of_device_is_compatible (np,"aspeed,ast2500-wdt" )) { +if ((of_device_is_compatible (np,"aspeed,ast2500-wdt" )) || + (of_device_is_compatible (np,"aspeed,ast2600-wdt" ))) {u32 reg =readl (wdt->base +WDT_RESET_WIDTH ); reg &= config->ext_pulse_width_mask;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/43 netfilter: nf_tables: allow lookups in dynamic sets
In reply to Sasha LevinFrom: Florian Westphal <[email protected]>
[ Upstream commit acab713177377d9e0889c46bac7ff0cfb9a90c4d ]
This un-breaks lookups in sets that have the 'dynamic' flag set. Given this active example configuration:
table filter {
set set1 {
type ipv4_addr
size 64
flags dynamic,timeout
timeout 1m}
chain input {
type filter hook input priority 0; policy accept; }
}
... this works:
nft add rule ip filter input add @set1 { ip saddr }
-> whenever rule is triggered, the source ip address is inserted into the set (if it did not exist).
This won't work:
nft add rule ip filter input ip saddr @set1 counter
Error: Could not process rule: Operation not supported
In other words, we can add entries to the set, but then can't make matching decision based on that set.
That is just wrong -- all set backends support lookups (else they would not be very useful).
The failure comes from an explicit rejection in nft_lookup.c.
Looking at the history, it seems like NFT_SET_EVAL used to mean 'set contains expressions' (aka. "is a meter"), for instance something like
nft add rule ip filter input meter example { ip saddr limit rate 10/second } or
nft add rule ip filter input meter example { ip saddr counter }
The actual meaning of NFT_SET_EVAL however, is
'set can be updated from the packet path'.
'meters' and packet-path insertions into sets, such as
'add @set { ip saddr }' use exactly the same kernel code (nft_dynset.c) and thus require a set backend that provides the ->update() function.
The only set that provides this also is the only one that has the NFT_SET_EVAL feature flag.
Removing the wrong check makes the above example work. While at it, also fix the flag check during set instantiation to allow supported combinations only.
--- net/netfilter/nf_tables_api.c | 7 +++++-- net/netfilter/nft_lookup.c | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_api.c +5 -2
@@ -3429,8 +3429,11 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk, NFT_SET_OBJECT))return -EINVAL ;/* Only one of these operations is supported */ -if ((flags & (NFT_SET_MAP |NFT_SET_EVAL |NFT_SET_OBJECT )) == - (NFT_SET_MAP |NFT_SET_EVAL |NFT_SET_OBJECT )) +if ((flags & (NFT_SET_MAP |NFT_SET_OBJECT )) == + (NFT_SET_MAP |NFT_SET_OBJECT )) +return -EOPNOTSUPP ; +if ((flags & (NFT_SET_EVAL |NFT_SET_OBJECT )) == + (NFT_SET_EVAL |NFT_SET_OBJECT ))return -EOPNOTSUPP ; }
net/netfilter/nft_lookup.c +0 -3
@@ -76,9 +76,6 @@ static int nft_lookup_init(const struct nft_ctx *ctx,if (IS_ERR (set))return PTR_ERR (set); -if (set->flags &NFT_SET_EVAL ) -return -EOPNOTSUPP ; - priv->sreg =nft_parse_register (tb[NFTA_LOOKUP_SREG ]); err =nft_validate_register_load (priv->sreg, set->klen);if (err <0 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/43 drm/amdgpu: Fix KFD-related kernel oops on Hawaii
In reply to Sasha LevinFrom: Felix Kuehling <[email protected]>
[ Upstream commit dcafbd50f2e4d5cc964aae409fb5691b743fba23 ]
Hawaii needs to flush caches explicitly, submitting an IB in a user VMID from kernel mode. There is no s_fence in this case.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +2 -1
@@ -139,7 +139,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,/* ring tests don't use a job */ if (job) { vm = job->vm; - fence_ctx = job->base.s_fence->scheduled.context; + fence_ctx = job->base.s_fence ? + job->base.s_fence->scheduled.context :0 ; }else { vm =NULL ; fence_ctx =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/43 drm/amdgpu: Check for valid number of registers to read
In reply to Sasha LevinFrom: Trek <[email protected]>
[ Upstream commit 73d8e6c7b841d9bf298c8928f228fb433676635c ]
Do not try to allocate any amount of memory requested by the user. Instead limit it to 128 registers. Actually the longest series of consecutive allowed registers are 48, mmGB_TILE_MODE0-31 and mmGB_MACROTILE_MODE0-15 (0x2644-0x2673).
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +3 -0
@@ -562,6 +562,9 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_fileif (sh_num ==AMDGPU_INFO_MMR_SH_INDEX_MASK ) sh_num =0xffffffff ; +if (info->read_mmr_reg.count >128 ) +return -EINVAL ; + regs =kmalloc_array (info->read_mmr_reg.count,sizeof (*regs),GFP_KERNEL );if (!regs)return -ENOMEM ;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 15/43 pNFS: Ensure we do clear the return-on-close layout stateid on fatal errors
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit 9c47b18cf722184f32148784189fca945a7d0561 ]
IF the server rejected our layout return with a state error such as NFS4ERR_BAD_STATEID, or even a stale inode error, then we do want to clear out all the remaining layout segments and mark that stateid as invalid.
--- fs/nfs/pnfs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/nfs/pnfs.c +7 -2
@@ -1426,10 +1426,15 @@ void pnfs_roc_release(struct nfs4_layoutreturn_args *args,const nfs4_stateid *res_stateid =NULL ;struct nfs4_xdr_opaque_data *ld_private = args->ld_private; -if (ret ==0 ) { - arg_stateid = &args->stateid; +switch (ret) { +case -NFS4ERR_NOMATCHING_LAYOUT : +break ; +case 0 :if (res->lrs_present) res_stateid = &res->stateid; +/* Fallthrough */ +default : + arg_stateid = &args->stateid; }pnfs_layoutreturn_free_lsegs (lo, arg_stateid, &args->range, res_stateid);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/43 net/sched: act_sample: don't push mac header on ip6gre ingress
In reply to Sasha LevinFrom: Davide Caratti <[email protected]>
[ Upstream commit 92974a1d006ad8b30d53047c70974c9e065eb7df ]
current 'sample' action doesn't push the mac header of ingress packets if they are received by a layer 3 tunnel (like gre or sit); but it forgot to check for gre over ipv6, so the following script:
# tc q a dev $d clsact # tc f a dev $d ingress protocol ip flower ip_proto icmp action sample \
Quoted 1 line
group 100 rate 1
# psample -v -g 100
dumps everything, including outer header and mac, when $d is a gre tunnel over ipv6. Fix this adding a missing label for ARPHRD_IP6GRE devices.
--- net/sched/act_sample.c | 1 + 1 file changed, 1 insertion(+)
net/sched/act_sample.c +1 -0
@@ -134,6 +134,7 @@ static bool tcf_sample_dev_ok_push(struct net_device *dev)case ARPHRD_TUNNEL6 :case ARPHRD_SIT :case ARPHRD_IPGRE : +case ARPHRD_IP6GRE :case ARPHRD_VOID :case ARPHRD_NONE :return false;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 17/43 pwm: stm32-lp: Add check in case requested period cannot be achieved
In reply to Sasha LevinFrom: Fabrice Gasnier <[email protected]>
[ Upstream commit c91e3234c6035baf5a79763cb4fcd5d23ce75c2b ]
LPTimer can use a 32KHz clock for counting. It depends on clock tree configuration. In such a case, PWM output frequency range is limited. Although unlikely, nothing prevents user from requesting a PWM frequency above counting clock (32KHz for instance):
- This causes (prd - 1) = 0xffff to be written in ARR register later in the apply() routine.
This results in badly configured PWM period (and also duty_cycle). Add a check to report an error is such a case.
--- drivers/pwm/pwm-stm32-lp.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/pwm/pwm-stm32-lp.c +6 -0
@@ -58,6 +58,12 @@ static int stm32_pwm_lp_apply(struct pwm_chip *chip, struct pwm_device *pwm,/* Calculate the period and prescaler value */ div = (unsigned long long )clk_get_rate (priv->clk) * state->period;do_div (div,NSEC_PER_SEC ); +if (!div) { +/* Clock is too slow to achieve requested period. */ +dev_dbg (priv->chip.dev,"Can't reach %u ns\n" , state->period); +return -EINVAL ; + } + prd = div;while (div >STM32_LPTIM_MAX_ARR ) { presc++;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 18/43 cdc_ncm: fix divide-by-zero caused by invalid wMaxPacketSize
In reply to Sasha LevinFrom: Bjørn Mork <[email protected]>
[ Upstream commit 3fe4b3351301660653a2bc73f2226da0ebd2b95e ]
Endpoints with zero wMaxPacketSize are not usable for transferring data. Ignore such endpoints when looking for valid in, out and status pipes, to make the driver more robust against invalid and meaningless descriptors.
The wMaxPacketSize of the out pipe is used as divisor. So this change fixes a divide-by-zero bug.
--- drivers/net/usb/cdc_ncm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/usb/cdc_ncm.c +5 -1
@@ -681,8 +681,12 @@ cdc_ncm_find_endpoints(struct usbnet *dev, struct usb_interface *intf)u8 ep;for (ep =0 ; ep < intf->cur_altsetting->desc.bNumEndpoints; ep++) { - e = intf->cur_altsetting->endpoint + ep; + +/* ignore endpoints which cannot transfer data */ +if (!usb_endpoint_maxp (&e->desc)) +continue ; +switch (e->desc.bmAttributes &USB_ENDPOINT_XFERTYPE_MASK ) {case USB_ENDPOINT_XFER_INT :if (usb_endpoint_dir_in (&e->desc)) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/43 usbnet: ignore endpoints with invalid wMaxPacketSize
In reply to Sasha LevinFrom: Bjørn Mork <[email protected]>
[ Upstream commit 8d3d7c2029c1b360f1a6b0a2fca470b57eb575c0 ]
Endpoints with zero wMaxPacketSize are not usable for transferring data. Ignore such endpoints when looking for valid in, out and status pipes, to make the drivers more robust against invalid and meaningless descriptors.
The wMaxPacketSize of these endpoints are used for memory allocations and as divisors in many usbnet minidrivers. Avoiding zero is therefore critical.
--- drivers/net/usb/usbnet.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/usb/usbnet.c +5 -0
@@ -112,6 +112,11 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)int intr =0 ; e = alt->endpoint + ep; + +/* ignore endpoints which cannot transfer data */ +if (!usb_endpoint_maxp (&e->desc)) +continue ; +switch (e->desc.bmAttributes) {case USB_ENDPOINT_XFER_INT :if (!usb_endpoint_dir_in (&e->desc))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 20/43 net/phy: fix DP83865 10 Mbps HDX loopback disable function
In reply to Sasha LevinFrom: Peter Mamonov <[email protected]>
[ Upstream commit e47488b2df7f9cb405789c7f5d4c27909fc597ae ]
According to the DP83865 datasheet "the 10 Mbps HDX loopback can be disabled in the expanded memory register 0x1C0.1". The driver erroneously used bit 0 instead of bit 1.
--- drivers/net/phy/national.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/phy/national.c +6 -3
@@ -110,14 +110,17 @@ static void ns_giga_speed_fallback(struct phy_device *phydev, int mode)static void ns_10_base_t_hdx_loopack (struct phy_device *phydev,int disable) { +u16 lb_dis =BIT (1 ); +if (disable) -ns_exp_write (phydev,0x1c0 ,ns_exp_read (phydev,0x1c0 ) |1 ); +ns_exp_write (phydev,0x1c0 , +ns_exp_read (phydev,0x1c0 ) | lb_dis);else ns_exp_write (phydev,0x1c0 , -ns_exp_read (phydev,0x1c0 ) &0xfffe ); +ns_exp_read (phydev,0x1c0 ) & ~lb_dis);pr_debug ("10BASE-T HDX loopback %s\n" , - (ns_exp_read (phydev,0x1c0 ) &0x0001 ) ?"off" :"on" ); + (ns_exp_read (phydev,0x1c0 ) & lb_dis) ?"off" :"on" ); }static int ns_config_init (struct phy_device *phydev)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 21/43 net_sched: add max len check for TCA_KIND
In reply to Sasha LevinFrom: Cong Wang <[email protected]>
[ Upstream commit 62794fc4fbf52f2209dc094ea255eaef760e7d01 ]
The TCA_KIND attribute is of NLA_STRING which does not check the NUL char. KMSAN reported an uninit-value of TCA_KIND which is likely caused by the lack of NUL.
Change it to NLA_NUL_STRING and add a max len too.
--- net/sched/sch_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sched/sch_api.c +2 -1
@@ -1308,7 +1308,8 @@ check_loop_fn(struct Qdisc *q, unsigned long cl, struct qdisc_walker *w) }const struct nla_policy rtm_tca_policy[TCA_MAX +1 ] = { - [TCA_KIND ] = { .type =NLA_STRING }, + [TCA_KIND ] = { .type =NLA_NUL_STRING , + .len =IFNAMSIZ -1 }, [TCA_RATE ] = { .type =NLA_BINARY , .len =sizeof (struct tc_estimator ) }, [TCA_STAB ] = { .type =NLA_NESTED },
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 22/43 x86/purgatory: Disable the stackleak GCC plugin for the purgatory
In reply to Sasha LevinFrom: Arvind Sankar <[email protected]>
[ Upstream commit ca14c996afe7228ff9b480cf225211cc17212688 ]
Since commit:
b059f801a937 ("x86/purgatory: Use CFLAGS_REMOVE rather than reset KBUILD_CFLAGS")
kexec breaks if GCC_PLUGIN_STACKLEAK=y is enabled, as the purgatory contains undefined references to stackleak_track_stack.
Attempting to load a kexec kernel results in this failure:
kexec: Undefined symbol: stackleak_track_stack
kexec-bzImage64: Loading purgatory failed
Fix this by disabling the stackleak plugin for the purgatory.
--- arch/x86/purgatory/Makefile | 1 + 1 file changed, 1 insertion(+)
arch/x86/purgatory/Makefile +1 -0
@@ -23,6 +23,7 @@ KCOV_INSTRUMENT := n PURGATORY_CFLAGS_REMOVE := -mcmodel=kernel PURGATORY_CFLAGS := -mcmodel=large -ffreestanding -fno-zero-initialized-in-bss +PURGATORY_CFLAGS += $(DISABLE_STACKLEAK_PLUGIN) # Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That # in turn leaves some undefined symbols like __fentry__ in purgatory and not
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 23/43 ntb: point to right memory window index
In reply to Sasha LevinFrom: Sanjay R Mehta <[email protected]>
[ Upstream commit ae89339b08f3fe02457ec9edd512ddc3d246d0f8 ]
second parameter of ntb_peer_mw_get_addr is pointing to wrong memory window index by passing "peer gidx" instead of "local gidx".
For ex, "local gidx" value is '0' and "peer gidx" value is '1', then
on peer side ntb_mw_set_trans() api is used as below with gidx pointing to local side gidx which is '0', so memroy window '0' is chosen and XLAT '0' will be programmed by peer side.
ntb_mw_set_trans(perf->ntb, peer->pidx, peer->gidx, peer->inbuf_xlat,
peer->inbuf_size);Now, on local side ntb_peer_mw_get_addr() is been used as below with gidx pointing to "peer gidx" which is '1', so pointing to memory window '1' instead of memory window '0'.
ntb_peer_mw_get_addr(perf->ntb, peer->gidx, &phys_addr,
&peer->outbuf_size);So this patch pass "local gidx" as parameter to ntb_peer_mw_get_addr().
--- drivers/ntb/test/ntb_perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ntb/test/ntb_perf.c +1 -1
@@ -1373,7 +1373,7 @@ static int perf_setup_peer_mw(struct perf_peer *peer)int ret;/* Get outbound MW parameters and map it */ - ret =ntb_peer_mw_get_addr (perf->ntb, peer->gidx, &phys_addr, + ret =ntb_peer_mw_get_addr (perf->ntb, perf->gidx, &phys_addr, &peer->outbuf_size);if (ret)return ret;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 24/43 thermal: Fix use-after-free when unregistering thermal zone device
In reply to Sasha LevinFrom: Ido Schimmel <[email protected]>
[ Upstream commit 1851799e1d2978f68eea5d9dff322e121dcf59c1 ]
thermal_zone_device_unregister() cancels the delayed work that polls the thermal zone, but it does not wait for it to finish. This is racy with respect to the freeing of the thermal zone device, which can result in a use-after-free [1].
Fix this by waiting for the delayed work to finish before freeing the thermal zone device. Note that thermal_zone_device_set_polling() is never invoked from an atomic context, so it is safe to call cancel_delayed_work_sync() that can block.
[1]
[ +0.002221] ================================================================== [ +0.000064] BUG: KASAN: use-after-free in __mutex_lock+0x1076/0x11c0 [ +0.000016] Read of size 8 at addr ffff8881e48e0450 by task kworker/1:0/17
[ +0.000023] CPU: 1 PID: 17 Comm: kworker/1:0 Not tainted 5.2.0-rc6-custom-02495-g8e73ca3be4af #1701 [ +0.000010] Hardware name: Mellanox Technologies Ltd. MSN2100-CB2FO/SA001017, BIOS 5.6.5 06/07/2016 [ +0.000016] Workqueue: events_freezable_power_ thermal_zone_device_check [ +0.000012] Call Trace: [ +0.000021] dump_stack+0xa9/0x10e [ +0.000020] print_address_description.cold.2+0x9/0x25e [ +0.000018] __kasan_report.cold.3+0x78/0x9d [ +0.000016] kasan_report+0xe/0x20 [ +0.000016] __mutex_lock+0x1076/0x11c0 [ +0.000014] step_wise_throttle+0x72/0x150 [ +0.000018] handle_thermal_trip+0x167/0x760 [ +0.000019] thermal_zone_device_update+0x19e/0x5f0 [ +0.000019] process_one_work+0x969/0x16f0 [ +0.000017] worker_thread+0x91/0xc40 [ +0.000014] kthread+0x33d/0x400 [ +0.000015] ret_from_fork+0x3a/0x50
[ +0.000020] Allocated by task 1: [ +0.000015] save_stack+0x19/0x80 [ +0.000015] __kasan_kmalloc.constprop.4+0xc1/0xd0 [ +0.000014] kmem_cache_alloc_trace+0x152/0x320 [ +0.000015] thermal_zone_device_register+0x1b4/0x13a0 [ +0.000015] mlxsw_thermal_init+0xc92/0x23d0 [ +0.000014] __mlxsw_core_bus_device_register+0x659/0x11b0 [ +0.000013] mlxsw_core_bus_device_register+0x3d/0x90 [ +0.000013] mlxsw_pci_probe+0x355/0x4b0 [ +0.000014] local_pci_probe+0xc3/0x150 [ +0.000013] pci_device_probe+0x280/0x410 [ +0.000013] really_probe+0x26a/0xbb0 [ +0.000013] driver_probe_device+0x208/0x2e0 [ +0.000013] device_driver_attach+0xfe/0x140 [ +0.000013] __driver_attach+0x110/0x310 [ +0.000013] bus_for_each_dev+0x14b/0x1d0 [ +0.000013] driver_register+0x1c0/0x400 [ +0.000015] mlxsw_sp_module_init+0x5d/0xd3 [ +0.000014] do_one_initcall+0x239/0x4dd [ +0.000013] kernel_init_freeable+0x42b/0x4e8 [ +0.000012] kernel_init+0x11/0x18b [ +0.000013] ret_from_fork+0x3a/0x50
[ +0.000015] Freed by task 581: [ +0.000013] save_stack+0x19/0x80 [ +0.000014] __kasan_slab_free+0x125/0x170 [ +0.000013] kfree+0xf3/0x310 [ +0.000013] thermal_release+0xc7/0xf0 [ +0.000014] device_release+0x77/0x200 [ +0.000014] kobject_put+0x1a8/0x4c0 [ +0.000014] device_unregister+0x38/0xc0 [ +0.000014] thermal_zone_device_unregister+0x54e/0x6a0 [ +0.000014] mlxsw_thermal_fini+0x184/0x35a [ +0.000014] mlxsw_core_bus_device_unregister+0x10a/0x640 [ +0.000013] mlxsw_devlink_core_bus_device_reload+0x92/0x210 [ +0.000015] devlink_nl_cmd_reload+0x113/0x1f0 [ +0.000014] genl_family_rcv_msg+0x700/0xee0 [ +0.000013] genl_rcv_msg+0xca/0x170 [ +0.000013] netlink_rcv_skb+0x137/0x3a0 [ +0.000012] genl_rcv+0x29/0x40 [ +0.000013] netlink_unicast+0x49b/0x660 [ +0.000013] netlink_sendmsg+0x755/0xc90 [ +0.000013] __sys_sendto+0x3de/0x430 [ +0.000013] __x64_sys_sendto+0xe2/0x1b0 [ +0.000013] do_syscall_64+0xa4/0x4d0 [ +0.000013] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ +0.000017] The buggy address belongs to the object at ffff8881e48e0008
which belongs to the cache kmalloc-2k of size 2048
[ +0.000012] The buggy address is located 1096 bytes inside of
2048-byte region [ffff8881e48e0008, ffff8881e48e0808) [ +0.000007] The buggy address belongs to the page: [ +0.000012] page:ffffea0007923800 refcount:1 mapcount:0 mapping:ffff88823680d0c0 index:0x0 compound_mapcount: 0 [ +0.000020] flags: 0x200000000010200(slab|head) [ +0.000019] raw: 0200000000010200 ffffea0007682008 ffffea00076ab808 ffff88823680d0c0 [ +0.000016] raw: 0000000000000000 00000000000d000d 00000001ffffffff 0000000000000000 [ +0.000007] page dumped because: kasan: bad access detected
[ +0.000012] Memory state around the buggy address: [ +0.000012] ffff8881e48e0300: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ +0.000012] ffff8881e48e0380: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ +0.000012] >ffff8881e48e0400: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ +0.000008] ^ [ +0.000012] ffff8881e48e0480: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ +0.000012] ffff8881e48e0500: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ +0.000007] ==================================================================
--- drivers/thermal/thermal_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/thermal_core.c +1 -1
@@ -296,7 +296,7 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,mod_delayed_work (system_freezable_wq, &tz->poll_queue,msecs_to_jiffies (delay)); else - cancel_delayed_work(&tz->poll_queue); + cancel_delayed_work_sync(&tz->poll_queue); }static void monitor_thermal_zone (struct thermal_zone_device *tz)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 25/43 thermal_hwmon: Sanitize thermal_zone type
In reply to Sasha LevinFrom: Stefan Mavrodiev <[email protected]>
[ Upstream commit 8c7aa184281c01fc26f319059efb94725012921d ]
When calling thermal_add_hwmon_sysfs(), the device type is sanitized by replacing '-' with '_'. However tz->type remains unsanitized. Thus calling thermal_hwmon_lookup_by_type() returns no device. And if there is no device, thermal_remove_hwmon_sysfs() fails with "hwmon device lookup failed!".
The result is unregisted hwmon devices in the sysfs.
--- drivers/thermal/thermal_hwmon.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/thermal/thermal_hwmon.c +6 -2
@@ -87,13 +87,17 @@ static struct thermal_hwmon_device * thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz) {struct thermal_hwmon_device *hwmon; +char type[THERMAL_NAME_LENGTH ];mutex_lock (&thermal_hwmon_list_lock); -list_for_each_entry (hwmon, &thermal_hwmon_list, node) -if (!strcmp (hwmon->type, tz->type)) { +list_for_each_entry (hwmon, &thermal_hwmon_list, node) { +strcpy (type, tz->type); +strreplace (type,'-' ,'_' ); +if (!strcmp (hwmon->type, type)) {mutex_unlock (&thermal_hwmon_list_lock);return hwmon; } + }mutex_unlock (&thermal_hwmon_list_lock);return NULL ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 26/43 libnvdimm/region: Initialize bad block for volatile namespaces
In reply to Sasha LevinFrom: "Aneesh Kumar K.V" <[email protected]>
[ Upstream commit c42adf87e4e7ed77f6ffe288dc90f980d07d68df ]
We do check for a bad block during namespace init and that use region bad block list. We need to initialize the bad block for volatile regions for this to work. We also observe a lockdep warning as below because the lock is not initialized correctly since we skip bad block init for volatile regions.
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
CPU: 2 PID: 1 Comm: swapper/0 Not tainted 5.3.0-rc1-15699-g3dee241c937e #149 Call Trace: [c0000000f95cb250] [c00000000147dd84] dump_stack+0xe8/0x164 (unreliable) [c0000000f95cb2a0] [c00000000022ccd8] register_lock_class+0x308/0xa60 [c0000000f95cb3a0] [c000000000229cc0] __lock_acquire+0x170/0x1ff0 [c0000000f95cb4c0] [c00000000022c740] lock_acquire+0x220/0x270 [c0000000f95cb580] [c000000000a93230] badblocks_check+0xc0/0x290 [c0000000f95cb5f0] [c000000000d97540] nd_pfn_validate+0x5c0/0x7f0 [c0000000f95cb6d0] [c000000000d98300] nd_dax_probe+0xd0/0x1f0 [c0000000f95cb760] [c000000000d9b66c] nd_pmem_probe+0x10c/0x160 [c0000000f95cb790] [c000000000d7f5ec] nvdimm_bus_probe+0x10c/0x240 [c0000000f95cb820] [c000000000d0f844] really_probe+0x254/0x4e0 [c0000000f95cb8b0] [c000000000d0fdfc] driver_probe_device+0x16c/0x1e0 [c0000000f95cb930] [c000000000d10238] device_driver_attach+0x68/0xa0 [c0000000f95cb970] [c000000000d1040c] __driver_attach+0x19c/0x1c0 [c0000000f95cb9f0] [c000000000d0c4c4] bus_for_each_dev+0x94/0x130 [c0000000f95cba50] [c000000000d0f014] driver_attach+0x34/0x50 [c0000000f95cba70] [c000000000d0e208] bus_add_driver+0x178/0x2f0 [c0000000f95cbb00] [c000000000d117c8] driver_register+0x108/0x170 [c0000000f95cbb70] [c000000000d7edb0] __nd_driver_register+0xe0/0x100 [c0000000f95cbbd0] [c000000001a6baa4] nd_pmem_driver_init+0x34/0x48 [c0000000f95cbbf0] [c0000000000106f4] do_one_initcall+0x1d4/0x4b0 [c0000000f95cbcd0] [c0000000019f499c] kernel_init_freeable+0x544/0x65c [c0000000f95cbdb0] [c000000000010d6c] kernel_init+0x2c/0x180 [c0000000f95cbe20] [c00000000000b954] ret_from_kernel_thread+0x5c/0x68
--- drivers/nvdimm/bus.c | 2 +- drivers/nvdimm/region.c | 4 ++-- drivers/nvdimm/region_devs.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/nvdimm/bus.c +1 -1
@@ -189,7 +189,7 @@ static int nvdimm_clear_badblocks_region(struct device *dev, void *data)sector_t sector;/* make sure device is a region */ -if (!is_nd_pmem (dev)) +if (!is_memory (dev))return 0 ; nd_region =to_nd_region (dev);
drivers/nvdimm/region.c +2 -2
@@ -42,7 +42,7 @@ static int nd_region_probe(struct device *dev)if (rc)return rc; -if (is_nd_pmem (&nd_region->dev)) { +if (is_memory (&nd_region->dev)) {struct resource ndr_res;if (devm_init_badblocks (dev, &nd_region->bb))
@@ -131,7 +131,7 @@ static void nd_region_notify(struct device *dev, enum nvdimm_event event)struct nd_region *nd_region =to_nd_region (dev);struct resource res; -if (is_nd_pmem (&nd_region->dev)) { +if (is_memory (&nd_region->dev)) { res.start = nd_region->ndr_start; res.end = nd_region->ndr_start + nd_region->ndr_size -1 ;
drivers/nvdimm/region_devs.c +2 -2
@@ -633,11 +633,11 @@ static umode_t region_visible(struct kobject *kobj, struct attribute *a, int n)if (!is_memory (dev) && a == &dev_attr_dax_seed.attr)return 0 ; -if (!is_nd_pmem (dev) && a == &dev_attr_badblocks.attr) +if (!is_memory (dev) && a == &dev_attr_badblocks.attr)return 0 ;if (a == &dev_attr_resource.attr) { -if (is_nd_pmem (dev)) +if (is_memory (dev))return 0400 ;else return 0 ;
Signature · 4 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
Sasha Levin
maintainerPATCH 27/43 fuse: fix memleak in cuse_channel_open
In reply to Sasha LevinFrom: zhengbin <[email protected]>
[ Upstream commit 9ad09b1976c562061636ff1e01bfc3a57aebe56b ]
If cuse_send_init fails, need to fuse_conn_put cc->fc.
cuse_channel_open->fuse_conn_init->refcount_set(&fc->count, 1)
->fuse_dev_alloc->fuse_conn_get
->fuse_dev_free->fuse_conn_put--- fs/fuse/cuse.c | 1 + 1 file changed, 1 insertion(+)
fs/fuse/cuse.c +1 -0
@@ -518,6 +518,7 @@ static int cuse_channel_open(struct inode *inode, struct file *file) rc =cuse_send_init (cc);if (rc) {fuse_dev_free (fud); +fuse_conn_put (&cc->fc);return rc; } file->private_data = fud;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 28/43 arcnet: provide a buffer big enough to actually receive packets
In reply to Sasha LevinFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 02a07046834e64970f3bcd87a422ac2b0adb80de ]
struct archdr is only big enough to hold the header of various types of arcnet packets. So to provide enough space to hold the data read from hardware provide a buffer large enough to hold a packet with maximal size.
The problem was noticed by the stack protector which makes the kernel oops.
--- drivers/net/arcnet/arcnet.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/net/arcnet/arcnet.c +17 -14
@@ -1063,31 +1063,34 @@ EXPORT_SYMBOL(arcnet_interrupt);static void arcnet_rx (struct net_device *dev,int bufnum) {struct arcnet_local *lp =netdev_priv (dev); -struct archdr pkt; +union { +struct archdr pkt; +char buf[512 ]; + } rxdata;struct arc_rfc1201 *soft;int length, ofs; - soft = &pkt.soft.rfc1201; + soft = &rxdata.pkt.soft.rfc1201; - lp->hw.copy_from_card (dev, bufnum,0 , &pkt,ARC_HDR_SIZE ); -if (pkt.hard.offset[0 ]) { - ofs = pkt.hard.offset[0 ]; + lp->hw.copy_from_card (dev, bufnum,0 , &rxdata.pkt,ARC_HDR_SIZE ); +if (rxdata.pkt.hard.offset[0 ]) { + ofs = rxdata.pkt.hard.offset[0 ]; length =256 - ofs; }else { - ofs = pkt.hard.offset[1 ]; + ofs = rxdata.pkt.hard.offset[1 ]; length =512 - ofs; }/* get the full header, if possible */ -if (sizeof (pkt.soft) <= length) { - lp->hw.copy_from_card (dev, bufnum, ofs, soft,sizeof (pkt.soft)); +if (sizeof (rxdata.pkt.soft) <= length) { + lp->hw.copy_from_card (dev, bufnum, ofs, soft,sizeof (rxdata.pkt.soft)); }else { -memset (&pkt.soft,0 ,sizeof (pkt.soft)); +memset (&rxdata.pkt.soft,0 ,sizeof (rxdata.pkt.soft)); lp->hw.copy_from_card (dev, bufnum, ofs, soft, length); }arc_printk (D_DURING , dev,"Buffer #%d: received packet from %02Xh to %02Xh (%d+4 bytes)\n" , - bufnum, pkt.hard.source, pkt.hard.dest, length); + bufnum, rxdata.pkt.hard.source, rxdata.pkt.hard.dest, length); dev->stats.rx_packets++; dev->stats.rx_bytes += length +ARC_HDR_SIZE ;
@@ -1096,13 +1099,13 @@ static void arcnet_rx(struct net_device *dev, int bufnum)if (arc_proto_map[soft->proto]->is_ip) {if (BUGLVL (D_PROTO )) {struct ArcProto - *oldp = arc_proto_map[lp->default_proto[pkt.hard.source]], + *oldp = arc_proto_map[lp->default_proto[rxdata.pkt.hard.source]], *newp = arc_proto_map[soft->proto];if (oldp != newp) {arc_printk (D_PROTO , dev,"got protocol %02Xh; encap for host %02Xh is now '%c' (was '%c')\n" , - soft->proto, pkt.hard.source, + soft->proto, rxdata.pkt.hard.source, newp->suffix, oldp->suffix); } }
@@ -1111,10 +1114,10 @@ static void arcnet_rx(struct net_device *dev, int bufnum) lp->default_proto[0 ] = soft->proto;/* in striking contrast, the following isn't a hack. */ - lp->default_proto[pkt.hard.source] = soft->proto; + lp->default_proto[rxdata.pkt.hard.source] = soft->proto; }/* call the protocol-specific receiver. */ - arc_proto_map[soft->proto]->rx (dev, bufnum, &pkt, length); + arc_proto_map[soft->proto]->rx (dev, bufnum, &rxdata.pkt, length); } static void null_rx(struct net_device *dev, int bufnum,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 29/43 libnvdimm/nfit_test: Fix acpi_handle redefinition
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 59f08896f058a92f03a0041b397a1a227c5e8529 ]
After commit 62974fc389b3 ("libnvdimm: Enable unit test infrastructure compile checks"), clang warns:
In file included from ../drivers/nvdimm/../../tools/testing/nvdimm/test/iomap.c:15:../drivers/nvdimm/../../tools/testing/nvdimm/test/nfit_test.h:206:15:
warning: redefinition of typedef 'acpi_handle' is a C11 feature [-Wtypedef-redefinition]
typedef void *acpi_handle;
^
../include/acpi/actypes.h:424:15: note: previous definition is here
typedef void *acpi_handle; /* Actually a ptr to a NS Node */
^1 warning generated.
The include chain:
iomap.c ->
linux/acpi.h ->
acpi/acpi.h ->
acpi/actypes.h
nfit_test.hAvoid this by including linux/acpi.h in nfit_test.h, which allows us to remove both the typedef and the forward declaration of acpi_object.
--- tools/testing/nvdimm/test/nfit_test.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
tools/testing/nvdimm/test/nfit_test.h +1 -3
@@ -12,6 +12,7 @@*/ #ifndef __NFIT_TEST_H__#define __NFIT_TEST_H__ +#include <linux/acpi.h> #include <linux/list.h> #include <linux/uuid.h> #include <linux/ioport.h>
@@ -234,9 +235,6 @@ struct nd_intel_lss {__u32 status; } __packed; -union acpi_object ; -typedef void *acpi_handle ; -typedef struct nfit_test_resource *(*nfit_test_lookup_fn )(resource_size_t ); typedef union acpi_object *(*nfit_test_evaluate_dsm_fn)(acpi_handle handle, const guid_t *guid, u64 rev, u64 func,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 30/43 ppp: Fix memory leak in ppp_write
In reply to Sasha LevinFrom: Takeshi Misawa <[email protected]>
[ Upstream commit 4c247de564f1ff614d11b3bb5313fb70d7b9598b ]
When ppp is closing, __ppp_xmit_process() failed to enqueue skb and skb allocated in ppp_write() is leaked.
syzbot reported :
BUG: memory leak
unreferenced object 0xffff88812a17bc00 (size 224):
comm "syz-executor673", pid 6952, jiffies 4294942888 (age 13.040s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000d110fff9>] kmemleak_alloc_recursive include/linux/kmemleak.h:43 [inline]
[<00000000d110fff9>] slab_post_alloc_hook mm/slab.h:522 [inline]
[<00000000d110fff9>] slab_alloc_node mm/slab.c:3262 [inline]
[<00000000d110fff9>] kmem_cache_alloc_node+0x163/0x2f0 mm/slab.c:3574
[<000000002d616113>] __alloc_skb+0x6e/0x210 net/core/skbuff.c:197
[<000000000167fc45>] alloc_skb include/linux/skbuff.h:1055 [inline]
[<000000000167fc45>] ppp_write+0x48/0x120 drivers/net/ppp/ppp_generic.c:502
[<000000009ab42c0b>] __vfs_write+0x43/0xa0 fs/read_write.c:494
[<00000000086b2e22>] vfs_write fs/read_write.c:558 [inline]
[<00000000086b2e22>] vfs_write+0xee/0x210 fs/read_write.c:542
[<00000000a2b70ef9>] ksys_write+0x7c/0x130 fs/read_write.c:611
[<00000000ce5e0fdd>] __do_sys_write fs/read_write.c:623 [inline]
[<00000000ce5e0fdd>] __se_sys_write fs/read_write.c:620 [inline]
[<00000000ce5e0fdd>] __x64_sys_write+0x1e/0x30 fs/read_write.c:620
[<00000000d9d7b370>] do_syscall_64+0x76/0x1a0 arch/x86/entry/common.c:296
[<0000000006e6d506>] entry_SYSCALL_64_after_hwframe+0x44/0xa9Fix this by freeing skb, if ppp is closing.
--- drivers/net/ppp/ppp_generic.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ppp/ppp_generic.c +2 -0
@@ -1419,6 +1419,8 @@ static void __ppp_xmit_process(struct ppp *ppp, struct sk_buff *skb)netif_wake_queue (ppp->dev); else netif_stop_queue(ppp->dev); + }else { +kfree_skb (skb); }ppp_xmit_unlock (ppp); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 31/43 sched/membarrier: Call sync_core only before usermode for same mm
In reply to Sasha LevinFrom: Mathieu Desnoyers <[email protected]>
[ Upstream commit 2840cf02fae627860156737e83326df354ee4ec6 ]
When the prev and next task's mm change, switch_mm() provides the core serializing guarantees before returning to usermode. The only case where an explicit core serialization is needed is when the scheduler keeps the same mm for prev and next.
--- include/linux/sched/mm.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/sched/mm.h +2 -0
@@ -330,6 +330,8 @@ enum {static inline void membarrier_mm_sync_core_before_usermode (struct mm_struct *mm) { +if (current->mm != mm) +return ;if (likely (!(atomic_read (&mm->membarrier_state) &MEMBARRIER_STATE_PRIVATE_EXPEDITED_SYNC_CORE )))return ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 32/43 sched/membarrier: Fix private expedited registration check
In reply to Sasha LevinFrom: Mathieu Desnoyers <[email protected]>
[ Upstream commit fc0d77387cb5ae883fd774fc559e056a8dde024c ]
Fix a logic flaw in the way membarrier_register_private_expedited() handles ready state checks for private expedited sync core and private expedited registrations.
If a private expedited membarrier registration is first performed, and then a private expedited sync_core registration is performed, the ready state check will skip the second registration when it really should not.
--- kernel/sched/membarrier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/membarrier.c +1 -1
@@ -235,7 +235,7 @@ static int membarrier_register_private_expedited(int flags)* groups, which use the same mm. (CLONE_VM but not * CLONE_THREAD). */ -if (atomic_read (&mm->membarrier_state) & state) +if ((atomic_read (&mm->membarrier_state) & state) == state)return 0 ;atomic_or (MEMBARRIER_STATE_PRIVATE_EXPEDITED , &mm->membarrier_state);if (flags &MEMBARRIER_FLAG_SYNC_CORE )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 33/43 sched/core: Fix migration to invalid CPU in __set_cpus_allowed_ptr()
In reply to Sasha LevinFrom: KeMeng Shi <[email protected]>
[ Upstream commit 714e501e16cd473538b609b3e351b2cc9f7f09ed ]
An oops can be triggered in the scheduler when running qemu on arm64:
Unable to handle kernel paging request at virtual address ffff000008effe40 Internal error: Oops: 96000007 [#1] SMP Process migration/0 (pid: 12, stack limit = 0x00000000084e3736) pstate: 20000085 (nzCv daIf -PAN -UAO) pc : __ll_sc___cmpxchg_case_acq_4+0x4/0x20 lr : move_queued_task.isra.21+0x124/0x298 ... Call trace: __ll_sc___cmpxchg_case_acq_4+0x4/0x20 __migrate_task+0xc8/0xe0 migration_cpu_stop+0x170/0x180 cpu_stopper_thread+0xec/0x178 smpboot_thread_fn+0x1ac/0x1e8 kthread+0x134/0x138 ret_from_fork+0x10/0x18
__set_cpus_allowed_ptr() will choose an active dest_cpu in affinity mask to migrage the process if process is not currently running on any one of the CPUs specified in affinity mask. __set_cpus_allowed_ptr() will choose an invalid dest_cpu (dest_cpu >= nr_cpu_ids, 1024 in my virtual machine) if CPUS in an affinity mask are deactived by cpu_down after cpumask_intersects check. cpumask_test_cpu() of dest_cpu afterwards is overflown and may pass if corresponding bit is coincidentally set. As a consequence, kernel will access an invalid rq address associate with the invalid CPU in migration_cpu_stop->__migrate_task->move_queued_task and the Oops occurs.
The reproduce the crash:
1) A process repeatedly binds itself to cpu0 and cpu1 in turn by calling sched_setaffinity.
2) A shell script repeatedly does "echo 0 > /sys/devices/system/cpu/cpu1/online" and "echo 1 > /sys/devices/system/cpu/cpu1/online" in turn.
3) Oops appears if the invalid CPU is set in memory after tested cpumask.
--- kernel/sched/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/core.c +2 -2
@@ -1077,7 +1077,8 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,if (cpumask_equal (&p->cpus_allowed, new_mask)) goto out; -if (!cpumask_intersects (new_mask, cpu_valid_mask)) { + dest_cpu =cpumask_any_and (cpu_valid_mask, new_mask); +if (dest_cpu >= nr_cpu_ids) { ret = -EINVAL ; goto out; }
@@ -1098,7 +1099,6 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,if (cpumask_test_cpu (task_cpu (p), new_mask)) goto out; - dest_cpu =cpumask_any_and (cpu_valid_mask, new_mask);if (task_running (rq, p) || p->state ==TASK_WAKING ) {struct migration_arg arg = { p, dest_cpu };/* Need help from migration thread: drop lock and wait. */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 34/43 perf build: Add detection of java-11-openjdk-devel package
In reply to Sasha LevinFrom: Thomas Richter <[email protected]>
[ Upstream commit 815c1560bf8fd522b8d93a1d727868b910c1cc24 ]
With Java 11 there is no seperate JRE anymore.
Details:
https://coderanch.com/t/701603/java/JRE-JDK
Therefore the detection of the JRE needs to be adapted.
This change works for s390 and x86. I have not tested other platforms.
Committer testing:
Continues to work with the OpenJDK 8:
$ rm -f ~acme/lib64/libperf-jvmti.so $ rpm -qa | grep jdk-devel java-1.8.0-openjdk-devel-1.8.0.222.b10-0.fc30.x86_64 $ git log --oneline -1 a51937170f33 (HEAD -> perf/core) perf build: Add detection of java-11-openjdk-devel package $ rm -rf /tmp/build/perf ; mkdir -p /tmp/build/perf ; make -C tools/perf O=/tmp/build/perf install > /dev/null 2>1 $ ls -la ~acme/lib64/libperf-jvmti.so -rwxr-xr-x. 1 acme acme 230744 Sep 24 16:46 /home/acme/lib64/libperf-jvmti.so $
--- tools/perf/Makefile.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/Makefile.config +1 -1
@@ -837,7 +837,7 @@ ifndef NO_JVMTI JDIR=$(shell /usr/sbin/update-java-alternatives -l | head -1 | awk '{print $$3}') else ifneq (,$(wildcard /usr/sbin/alternatives)) - JDIR=$(shell /usr/sbin/alternatives --display java | tail -1 | cut -d' ' -f 5 | sed 's%/jre/bin/java.%%g') + JDIR=$(shell /usr/sbin/alternatives --display java | tail -1 | cut -d' ' -f 5 | sed -e 's%/jre/bin/java.%%g' -e 's%/bin/java.%%g') endif endif ifndef JDIR
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 35/43 kernel/elfcore.c: include proper prototypes
In reply to Sasha LevinFrom: Valdis Kletnieks <[email protected]>
[ Upstream commit 0f74914071ab7e7b78731ed62bf350e3a344e0a5 ]
When building with W=1, gcc properly complains that there's no prototypes:
CC kernel/elfcore.okernel/elfcore.c:7:17: warning: no previous prototype for 'elf_core_extra_phdrs' [-Wmissing-prototypes]
7 | Elf_Half __weak elf_core_extra_phdrs(void)
| ^~~~~~~~~~~~~~~~~~~~kernel/elfcore.c:12:12: warning: no previous prototype for 'elf_core_write_extra_phdrs' [-Wmissing-prototypes]
12 | int __weak elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
kernel/elfcore.c:17:12: warning: no previous prototype for 'elf_core_write_extra_data' [-Wmissing-prototypes]
17 | int __weak elf_core_write_extra_data(struct coredump_params *cprm)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
kernel/elfcore.c:22:15: warning: no previous prototype for 'elf_core_extra_data_size' [-Wmissing-prototypes]
22 | size_t __weak elf_core_extra_data_size(void)
| ^~~~~~~~~~~~~~~~~~~~~~~~Provide the include file so gcc is happy, and we don't have potential code drift
--- kernel/elfcore.c | 1 + 1 file changed, 1 insertion(+)
kernel/elfcore.c +1 -0
@@ -3,6 +3,7 @@#include <linux/fs.h> #include <linux/mm.h> #include <linux/binfmts.h> +#include <linux/elfcore.h> Elf_Half __weak elf_core_extra_phdrs (void ) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 36/43 kexec: bail out upon SIGKILL when allocating memory.
In reply to Sasha LevinFrom: Tetsuo Handa <[email protected]>
[ Upstream commit 7c3a6aedcd6aae0a32a527e68669f7dd667492d1 ]
syzbot found that a thread can stall for minutes inside kexec_load() after that thread was killed by SIGKILL [1]. It turned out that the reproducer was trying to allocate 2408MB of memory using kimage_alloc_page() from kimage_load_normal_segment(). Let's check for SIGKILL before doing memory allocation.
[1] https://syzkaller.appspot.com/bug?id=a0e3436829698d5824231251fad9d8e998f94f5e
--- kernel/kexec_core.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/kexec_core.c +2 -0
@@ -301,6 +301,8 @@ static struct page *kimage_alloc_pages(gfp_t gfp_mask, unsigned int order) {struct page *pages; +if (fatal_signal_pending (current)) +return NULL ; pages =alloc_pages (gfp_mask & ~__GFP_ZERO, order);if (pages) {unsigned int count, i;
Signature · 7 lines
2.20.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Sasha Levin
maintainerPATCH 37/43 macsec: drop skb sk before calling gro_cells_receive
In reply to Sasha LevinFrom: Xin Long <[email protected]>
[ Upstream commit ba56d8ce38c8252fff5b745db3899cf092578ede ]
Fei Liu reported a crash when doing netperf on a topo of macsec dev over veth:
[ 448.919128] refcount_t: underflow; use-after-free. [ 449.090460] Call trace: [ 449.092895] refcount_sub_and_test+0xb4/0xc0 [ 449.097155] tcp_wfree+0x2c/0x150 [ 449.100460] ip_rcv+0x1d4/0x3a8 [ 449.103591] __netif_receive_skb_core+0x554/0xae0 [ 449.108282] __netif_receive_skb+0x28/0x78 [ 449.112366] netif_receive_skb_internal+0x54/0x100 [ 449.117144] napi_gro_complete+0x70/0xc0 [ 449.121054] napi_gro_flush+0x6c/0x90 [ 449.124703] napi_complete_done+0x50/0x130 [ 449.128788] gro_cell_poll+0x8c/0xa8 [ 449.132351] net_rx_action+0x16c/0x3f8 [ 449.136088] __do_softirq+0x128/0x320
The issue was caused by skb's true_size changed without its sk's sk_wmem_alloc increased in tcp/skb_gro_receive(). Later when the skb is being freed and the skb's truesize is subtracted from its sk's sk_wmem_alloc in tcp_wfree(), underflow occurs.
macsec is calling gro_cells_receive() to receive a packet, which actually requires skb->sk to be NULL. However when macsec dev is over veth, it's possible the skb->sk is still set if the skb was not unshared or expanded from the peer veth.
ip_rcv() is calling skb_orphan() to drop the skb's sk for tproxy, but it is too late for macsec's calling gro_cells_receive(). So fix it by dropping the skb's sk earlier on rx path of macsec.
--- drivers/net/macsec.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/macsec.c +1 -0
@@ -1238,6 +1238,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)macsec_rxsa_put (rx_sa);macsec_rxsc_put (rx_sc); +skb_orphan (skb); ret =gro_cells_receive (&macsec->gro_cells, skb);if (ret ==NET_RX_SUCCESS )count_rx (dev, skb->len);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 38/43 perf unwind: Fix libunwind build failure on i386 systems
In reply to Sasha LevinFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 26acf400d2dcc72c7e713e1f55db47ad92010cc2 ]
Naresh Kamboju reported, that on the i386 build pr_err() doesn't get defined properly due to header ordering:
perf-in.o: In function `libunwind__x86_reg_id':
tools/perf/util/libunwind/../../arch/x86/util/unwind-libunwind.c:109:
undefined reference to `pr_err'
--- tools/perf/arch/x86/util/unwind-libunwind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/arch/x86/util/unwind-libunwind.c +1 -1
@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0 #include <errno.h> +#include "../../util/debug.h" #ifndef REMOTE_UNWIND_LIBUNWIND #include <libunwind.h> #include "perf_regs.h" #include "../../util/unwind.h" -#include "../../util/debug.h" #endif #ifdef HAVE_ARCH_X86_64_SUPPORT
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 39/43 nfp: flower: fix memory leak in nfp_flower_spawn_vnic_reprs
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 8ce39eb5a67aee25d9f05b40b673c95b23502e3e ]
In nfp_flower_spawn_vnic_reprs in the loop if initialization or the allocations fail memory is leaked. Appropriate releases are added.
--- drivers/net/ethernet/netronome/nfp/flower/main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/netronome/nfp/flower/main.c +3 -0
@@ -259,6 +259,7 @@ nfp_flower_spawn_vnic_reprs(struct nfp_app *app, repr_priv =kzalloc (sizeof (*repr_priv),GFP_KERNEL );if (!repr_priv) { err = -ENOMEM ; +nfp_repr_free (repr); goto err_reprs_clean; }
@@ -271,6 +272,7 @@ nfp_flower_spawn_vnic_reprs(struct nfp_app *app, port =nfp_port_alloc (app, port_type, repr);if (IS_ERR (port)) { err =PTR_ERR (port); +kfree (repr_priv);nfp_repr_free (repr); goto err_reprs_clean; }
@@ -291,6 +293,7 @@ nfp_flower_spawn_vnic_reprs(struct nfp_app *app, err =nfp_repr_init (app, repr, port_id, port, priv->nn->dp.netdev);if (err) { +kfree (repr_priv);nfp_port_free (port);nfp_repr_free (repr); goto err_reprs_clean;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 40/43 nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 8572cea1461a006bce1d06c0c4b0575869125fa4 ]
In nfp_flower_spawn_phy_reprs, in the for loop over eth_tbl if any of intermediate allocations or initializations fail memory is leaked. requiered releases are added.
--- drivers/net/ethernet/netronome/nfp/flower/main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/netronome/nfp/flower/main.c +4 -0
@@ -376,6 +376,7 @@ nfp_flower_spawn_phy_reprs(struct nfp_app *app, struct nfp_flower_priv *priv) repr_priv =kzalloc (sizeof (*repr_priv),GFP_KERNEL );if (!repr_priv) { err = -ENOMEM ; +nfp_repr_free (repr); goto err_reprs_clean; }
@@ -385,11 +386,13 @@ nfp_flower_spawn_phy_reprs(struct nfp_app *app, struct nfp_flower_priv *priv) port =nfp_port_alloc (app,NFP_PORT_PHYS_PORT , repr);if (IS_ERR (port)) { err =PTR_ERR (port); +kfree (repr_priv);nfp_repr_free (repr); goto err_reprs_clean; } err =nfp_port_init_phy_port (app->pf, app, port, i);if (err) { +kfree (repr_priv);nfp_port_free (port);nfp_repr_free (repr); goto err_reprs_clean;
@@ -402,6 +405,7 @@ nfp_flower_spawn_phy_reprs(struct nfp_app *app, struct nfp_flower_priv *priv) err =nfp_repr_init (app, repr, cmsg_port_id, port, priv->nn->dp.netdev);if (err) { +kfree (repr_priv);nfp_port_free (port);nfp_repr_free (repr); goto err_reprs_clean;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 41/43 drm/radeon: Bail earlier when radeon.cik_/si_support=0 is passed
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 9dbc88d013b79c62bd845cb9e7c0256e660967c5 ]
Bail from the pci_driver probe function instead of from the drm_driver load function.
This avoid /dev/dri/card0 temporarily getting registered and then unregistered again, sending unwanted add / remove udev events to userspace.
Specifically this avoids triggering the (userspace) bug fixed by this plymouth merge-request:
https://gitlab.freedesktop.org/plymouth/plymouth/merge_requests/59
Note that despite that being an userspace bug, not sending unnecessary udev events is a good idea in general.
--- drivers/gpu/drm/radeon/radeon_drv.c | 31 +++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_kms.c | 25 ----------------------- 2 files changed, 31 insertions(+), 25 deletions(-)
drivers/gpu/drm/radeon/radeon_drv.c +31 -0
@@ -340,8 +340,39 @@ static int radeon_kick_out_firmware_fb(struct pci_dev *pdev)static int radeon_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) { +unsigned long flags =0 ;int ret; +if (!ent) +return -ENODEV ;/* Avoid NULL-ptr deref in drm_get_pci_dev */ + + flags = ent->driver_data; + +if (!radeon_si_support) { +switch (flags &RADEON_FAMILY_MASK ) { +case CHIP_TAHITI : +case CHIP_PITCAIRN : +case CHIP_VERDE : +case CHIP_OLAND : +case CHIP_HAINAN : +dev_info (&pdev->dev, +"SI support disabled by module param\n" ); +return -ENODEV ; + } + } +if (!radeon_cik_support) { +switch (flags &RADEON_FAMILY_MASK ) { +case CHIP_KAVERI : +case CHIP_BONAIRE : +case CHIP_HAWAII : +case CHIP_KABINI : +case CHIP_MULLINS : +dev_info (&pdev->dev, +"CIK support disabled by module param\n" ); +return -ENODEV ; + } + } +if (vga_switcheroo_client_probe_defer (pdev))return -EPROBE_DEFER ;
drivers/gpu/drm/radeon/radeon_kms.c +0 -25
@@ -95,31 +95,6 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)struct radeon_device *rdev;int r, acpi_status; -if (!radeon_si_support) { -switch (flags &RADEON_FAMILY_MASK ) { -case CHIP_TAHITI : -case CHIP_PITCAIRN : -case CHIP_VERDE : -case CHIP_OLAND : -case CHIP_HAINAN : -dev_info (dev->dev, -"SI support disabled by module param\n" ); -return -ENODEV ; - } - } -if (!radeon_cik_support) { -switch (flags &RADEON_FAMILY_MASK ) { -case CHIP_KAVERI : -case CHIP_BONAIRE : -case CHIP_HAWAII : -case CHIP_KABINI : -case CHIP_MULLINS : -dev_info (dev->dev, -"CIK support disabled by module param\n" ); -return -ENODEV ; - } - } - rdev =kzalloc (sizeof (struct radeon_device ),GFP_KERNEL );if (rdev ==NULL ) {return -ENOMEM ;
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 42/43 usbnet: sanity checking of packet sizes and device mtu
In reply to Sasha LevinFrom: Oliver Neukum <[email protected]>
[ Upstream commit 280ceaed79f18db930c0cc8bb21f6493490bf29c ]
After a reset packet sizes and device mtu can change and need to be reevaluated to calculate queue sizes. Malicious devices can set this to zero and we divide by it. Introduce sanity checking.
--- drivers/net/usb/usbnet.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/usbnet.c +3 -0
@@ -356,6 +356,8 @@ void usbnet_update_max_qlen(struct usbnet *dev) {enum usb_device_speed speed = dev->udev->speed; +if (!dev->rx_urb_size || !dev->hard_mtu) + goto insanity;switch (speed) {case USB_SPEED_HIGH : dev->rx_qlen =MAX_QUEUE_MEMORY / dev->rx_urb_size;
@@ -372,6 +374,7 @@ void usbnet_update_max_qlen(struct usbnet *dev) dev->tx_qlen =5 *MAX_QUEUE_MEMORY / dev->hard_mtu;break ;default : +insanity: dev->rx_qlen = dev->tx_qlen =4 ; } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 43/43 sch_netem: fix a divide by zero in tabledist()
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit b41d936b5ecfdb3a4abc525ce6402a6c49cffddc ]
syzbot managed to crash the kernel in tabledist() loading an empty distribution table.
t = dist->table[rnd % dist->size];
Simply return an error when such load is attempted.
--- net/sched/sch_netem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_netem.c +1 -1
@@ -749,7 +749,7 @@ static int get_dist_table(struct Qdisc *sch, struct disttable **tbl,struct disttable *d;int i; -if (n >NETEM_DIST_MAX ) +if (!n || n >NETEM_DIST_MAX )return -EINVAL ; d =kvmalloc (sizeof (struct disttable ) + n *sizeof (s16),GFP_KERNEL );
Signature · 1 line
2.20.1