September 2018 - Linux-stable-mirror

FAILED: patch "[PATCH] ext4: close race between direct IO and ext4_break_layouts()" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b1f382178d150f256c1cf95b9341fda6eb764459 Mon Sep 17 00:00:00 2001 From: Ross Zwisler <zwisler(a)kernel.org> Date: Tue, 11 Sep 2018 13:31:16 -0400 Subject: [PATCH] ext4: close race between direct IO and ext4_break_layouts() If the refcount of a page is lowered between the time that it is returned by dax_busy_page() and when the refcount is again checked in ext4_break_layouts() => ___wait_var_event(), the waiting function ext4_wait_dax_page() will never be called. This means that ext4_break_layouts() will still have 'retry' set to false, so we'll stop looping and never check the refcount of other pages in this inode. Instead, always continue looping as long as dax_layout_busy_page() gives us a page which it found with an elevated refcount. Signed-off-by: Ross Zwisler <ross.zwisler(a)linux.intel.com> Reviewed-by: Jan Kara <jack(a)suse.cz> Signed-off-by: Jan Kara <jack(a)suse.cz> Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Cc: stable(a)vger.kernel.org diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 694f31364206..723058bfe43b 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4195,9 +4195,8 @@ int ext4_update_disksize_before_punch(struct inode *inode, loff_t offset, return 0; } -static void ext4_wait_dax_page(struct ext4_inode_info *ei, bool *did_unlock) +static void ext4_wait_dax_page(struct ext4_inode_info *ei) { - *did_unlock = true; up_write(&ei->i_mmap_sem); schedule(); down_write(&ei->i_mmap_sem); @@ -4207,14 +4206,12 @@ int ext4_break_layouts(struct inode *inode) { struct ext4_inode_info *ei = EXT4_I(inode); struct page *page; - bool retry; int error; if (WARN_ON_ONCE(!rwsem_is_locked(&ei->i_mmap_sem))) return -EINVAL; do { - retry = false; page = dax_layout_busy_page(inode->i_mapping); if (!page) return 0; @@ -4222,8 +4219,8 @@ int ext4_break_layouts(struct inode *inode) error = ___wait_var_event(&page->_refcount, atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE, 0, 0, - ext4_wait_dax_page(ei, &retry)); - } while (error == 0 && retry); + ext4_wait_dax_page(ei)); + } while (error == 0); return error; }

6 years, 7 months

2
1
0 0

[PATCH] drm/syncobj: Don't leak fences when WAIT_FOR_SUBMIT is set

by Jason Ekstrand

We attempt to get fences earlier in the hopes that everything will already have fences and no callbacks will be needed. If we do succeed in getting a fence, getting one a second time will result in a duplicate ref with no unref. This is causing memory leaks in Vulkan applications that create a lot of fences; playing for a few hours can, apparently, bring down the system. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107899 Signed-off-by: Jason Ekstrand <jason(a)jlekstrand.net> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/drm_syncobj.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index adb3cb27d31e..759278fef35a 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -97,6 +97,8 @@ static int drm_syncobj_fence_get_or_add_callback(struct drm_syncobj *syncobj, { int ret; + WARN_ON(*fence); + *fence = drm_syncobj_fence_get(syncobj); if (*fence) return 1; @@ -743,6 +745,9 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, if (flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT) { for (i = 0; i < count; ++i) { + if (entries[i].fence) + continue; + drm_syncobj_fence_get_or_add_callback(syncobjs[i], &entries[i].fence, &entries[i].syncobj_cb, -- 2.17.1

6 years, 7 months

3
2
0 0

[PATCH] drm/i915/fbc: Disable fbc with VT-d also with kbl and cfl

by Mika Kuoppala

Using fbc with VT-d flickers also on kbl and cfl. Cc: Paulo Zanoni <paulo.r.zanoni(a)intel.com> Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Cc: <stable(a)vger.kernel.org> # v4.9+ Signed-off-by: Mika Kuoppala <mika.kuoppala(a)linux.intel.com> --- drivers/gpu/drm/i915/intel_fbc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c index 74d425c700ef..a149f08c1b79 100644 --- a/drivers/gpu/drm/i915/intel_fbc.c +++ b/drivers/gpu/drm/i915/intel_fbc.c @@ -1275,9 +1275,10 @@ static int intel_sanitize_fbc_option(struct drm_i915_private *dev_priv) static bool need_fbc_vtd_wa(struct drm_i915_private *dev_priv) { - /* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */ + /* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt,kbl,cfl */ if (intel_vtd_active() && - (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))) { + (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv) || + IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv))) { DRM_INFO("Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n"); return true; } -- 2.17.1

6 years, 7 months

3
3
0 0

[PATCH stable v4.14] PCI: aardvark: Size bridges before resources allocation

by Thomas Petazzoni

From: Zachary Zhang <zhangzg(a)marvell.com> commit 91a2968e245d6ba616db37001fa1a043078b1a65 usptream. The PCIE I/O and MEM resource allocation mechanism is that root bus goes through the following steps: 1. Check PCI bridges' range and computes I/O and Mem base/limits. 2. Sort all subordinate devices I/O and MEM resource requirements and allocate the resources and writes/updates subordinate devices' requirements to PCI bridges I/O and Mem MEM/limits registers. Currently, PCI Aardvark driver only handles the second step and lacks the first step, so there is an I/O and MEM resource allocation failure when using a PCI switch. This commit fixes that by sizing bridges before doing the resource allocation. Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver") Signed-off-by: Zachary Zhang <zhangzg(a)marvell.com> [Thomas: edit commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi(a)arm.com> Cc: <stable(a)vger.kernel.org> --- drivers/pci/host/pci-aardvark.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index 9bfc22b5da4b..5f3048e75bec 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -954,6 +954,7 @@ static int advk_pcie_probe(struct platform_device *pdev) bus = bridge->bus; + pci_bus_size_bridges(bus); pci_bus_assign_resources(bus); list_for_each_entry(child, &bus->children, node) -- 2.14.4

6 years, 7 months

2
1
0 0

[PATCH stable v4.9] PCI: aardvark: Size bridges before resources allocation

by Thomas Petazzoni

From: Zachary Zhang <zhangzg(a)marvell.com> commit 91a2968e245d6ba616db37001fa1a043078b1a65 usptream. The PCIE I/O and MEM resource allocation mechanism is that root bus goes through the following steps: 1. Check PCI bridges' range and computes I/O and Mem base/limits. 2. Sort all subordinate devices I/O and MEM resource requirements and allocate the resources and writes/updates subordinate devices' requirements to PCI bridges I/O and Mem MEM/limits registers. Currently, PCI Aardvark driver only handles the second step and lacks the first step, so there is an I/O and MEM resource allocation failure when using a PCI switch. This commit fixes that by sizing bridges before doing the resource allocation. Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver") Signed-off-by: Zachary Zhang <zhangzg(a)marvell.com> [Thomas: edit commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi(a)arm.com> Cc: <stable(a)vger.kernel.org> --- drivers/pci/host/pci-aardvark.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index 11bad826683e..1dbd09c91a7c 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -976,6 +976,7 @@ static int advk_pcie_probe(struct platform_device *pdev) return -ENOMEM; } + pci_bus_size_bridges(bus); pci_bus_assign_resources(bus); list_for_each_entry(child, &bus->children, node) -- 2.14.4

6 years, 7 months

2
1
0 0

[PATCH v3.18 v4.4] arm64: Add trace_hardirqs_off annotation in ret_to_user

by Guenter Roeck

From: Catalin Marinas <catalin.marinas(a)arm.com> commit db3899a6477a4dccd26cbfb7f408b6be2cc068e0 upstream. When a kernel is built with CONFIG_TRACE_IRQFLAGS the following warning is produced when entering userspace for the first time: WARNING: at /work/Linux/linux-2.6-aarch64/kernel/locking/lockdep.c:3519 Modules linked in: CPU: 1 PID: 1 Comm: systemd Not tainted 4.4.0-rc3+ #639 Hardware name: Juno (DT) task: ffffffc9768a0000 ti: ffffffc9768a8000 task.ti: ffffffc9768a8000 PC is at check_flags.part.22+0x19c/0x1a8 LR is at check_flags.part.22+0x19c/0x1a8 pc : [<ffffffc0000fba6c>] lr : [<ffffffc0000fba6c>] pstate: 600001c5 sp : ffffffc9768abe10 x29: ffffffc9768abe10 x28: ffffffc9768a8000 x27: 0000000000000000 x26: 0000000000000001 x25: 00000000000000a6 x24: ffffffc00064be6c x23: ffffffc0009f249e x22: ffffffc9768a0000 x21: ffffffc97fea5480 x20: 00000000000001c0 x19: ffffffc00169a000 x18: 0000005558cc7b58 x17: 0000007fb78e3180 x16: 0000005558d2e238 x15: ffffffffffffffff x14: 0ffffffffffffffd x13: 0000000000000008 x12: 0101010101010101 x11: 7f7f7f7f7f7f7f7f x10: fefefefefefeff63 x9 : 7f7f7f7f7f7f7f7f x8 : 6e655f7371726964 x7 : 0000000000000001 x6 : ffffffc0001079c4 x5 : 0000000000000000 x4 : 0000000000000001 x3 : ffffffc001698438 x2 : 0000000000000000 x1 : ffffffc9768a0000 x0 : 000000000000002e Call trace: [<ffffffc0000fba6c>] check_flags.part.22+0x19c/0x1a8 [<ffffffc0000fc440>] lock_is_held+0x80/0x98 [<ffffffc00064bafc>] __schedule+0x404/0x730 [<ffffffc00064be6c>] schedule+0x44/0xb8 [<ffffffc000085bb0>] ret_to_user+0x0/0x24 possible reason: unannotated irqs-off. irq event stamp: 502169 hardirqs last enabled at (502169): [<ffffffc000085a98>] el0_irq_naked+0x1c/0x24 hardirqs last disabled at (502167): [<ffffffc0000bb3bc>] __do_softirq+0x17c/0x298 softirqs last enabled at (502168): [<ffffffc0000bb43c>] __do_softirq+0x1fc/0x298 softirqs last disabled at (502143): [<ffffffc0000bb830>] irq_exit+0xa0/0xf0 This happens because we disable interrupts in ret_to_user before calling schedule() in work_resched. This patch adds the necessary trace_hardirqs_off annotation. Signed-off-by: Catalin Marinas <catalin.marinas(a)arm.com> Reported-by: Mark Rutland <mark.rutland(a)arm.com> Cc: Will Deacon <will.deacon(a)arm.com> Signed-off-by: Will Deacon <will.deacon(a)arm.com> --- Without this patch and CONFIG_TRACE_IRQFLAGS enabled, the mentioned warning is seen in v3.18.y and v4.4.y. The patch applies cleanly to both releases. I confirmed that the problem is gone after applying it. arch/arm64/kernel/entry.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 7ed3d75f6304..e5b25389c48f 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -634,6 +634,9 @@ work_pending: bl do_notify_resume b ret_to_user work_resched: +#ifdef CONFIG_TRACE_IRQFLAGS + bl trace_hardirqs_off // the IRQs are off here, inform the tracing code +#endif bl schedule /* -- 2.7.4

6 years, 7 months

2
1
0 0

for stable: sched/fair: Fix vruntime_normalized() for remote non-migration wakeup

by Steve Muckle

Please pick up the following commit which has merged to Linus' tree: commit d0cdb3ce8834332d918fc9c8ff74f8a169ec9abe Author: Steve Muckle <smuckle(a)google.com> Date: Fri Aug 31 15:42:17 2018 -0700 sched/fair: Fix vruntime_normalized() for remote non-migration wakeup This commit is 3 lines in diffs. It fixes an issue where, during certain usecases, a task's vruntime may be greatly inflated, causing it to not execute with the priority that it should. The commit it fixes went into 4.7 so the fix should go into 4.9, 4.14, and 4.18. I have verified the commit applies cleanly to 4.9.128, 4.14.71, and 4.18.9. thanks, Steve

6 years, 7 months

2
1
0 0

FAILED: patch "[PATCH] ext4: close race between direct IO and ext4_break_layouts()" failed to apply to 4.18-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b1f382178d150f256c1cf95b9341fda6eb764459 Mon Sep 17 00:00:00 2001 From: Ross Zwisler <zwisler(a)kernel.org> Date: Tue, 11 Sep 2018 13:31:16 -0400 Subject: [PATCH] ext4: close race between direct IO and ext4_break_layouts() If the refcount of a page is lowered between the time that it is returned by dax_busy_page() and when the refcount is again checked in ext4_break_layouts() => ___wait_var_event(), the waiting function ext4_wait_dax_page() will never be called. This means that ext4_break_layouts() will still have 'retry' set to false, so we'll stop looping and never check the refcount of other pages in this inode. Instead, always continue looping as long as dax_layout_busy_page() gives us a page which it found with an elevated refcount. Signed-off-by: Ross Zwisler <ross.zwisler(a)linux.intel.com> Reviewed-by: Jan Kara <jack(a)suse.cz> Signed-off-by: Jan Kara <jack(a)suse.cz> Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Cc: stable(a)vger.kernel.org diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 694f31364206..723058bfe43b 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4195,9 +4195,8 @@ int ext4_update_disksize_before_punch(struct inode *inode, loff_t offset, return 0; } -static void ext4_wait_dax_page(struct ext4_inode_info *ei, bool *did_unlock) +static void ext4_wait_dax_page(struct ext4_inode_info *ei) { - *did_unlock = true; up_write(&ei->i_mmap_sem); schedule(); down_write(&ei->i_mmap_sem); @@ -4207,14 +4206,12 @@ int ext4_break_layouts(struct inode *inode) { struct ext4_inode_info *ei = EXT4_I(inode); struct page *page; - bool retry; int error; if (WARN_ON_ONCE(!rwsem_is_locked(&ei->i_mmap_sem))) return -EINVAL; do { - retry = false; page = dax_layout_busy_page(inode->i_mapping); if (!page) return 0; @@ -4222,8 +4219,8 @@ int ext4_break_layouts(struct inode *inode) error = ___wait_var_event(&page->_refcount, atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE, 0, 0, - ext4_wait_dax_page(ei, &retry)); - } while (error == 0 && retry); + ext4_wait_dax_page(ei)); + } while (error == 0); return error; }

6 years, 7 months

1
0
0 0

FAILED: patch "[PATCH] drm/vmwgfx: Fix buffer object eviction" failed to apply to 4.18-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From e71cf591876536f7dd5a54ef68d631278ca6faa1 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom <thellstrom(a)vmware.com> Date: Fri, 14 Sep 2018 09:24:19 +0200 Subject: [PATCH] drm/vmwgfx: Fix buffer object eviction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 19be55701071 ("drm/ttm: add operation ctx to ttm_bo_validate v2") introduced a regression where the vmwgfx driver refused to evict a buffer that was still busy instead of waiting for it to become idle. Fix this. Cc: <stable(a)vger.kernel.org> Signed-off-by: Thomas Hellstrom <thellstrom(a)vmware.com> Reviewed-by: Christian König <christian.koenig(a)amd.com> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c index 1f134570b759..f0ab6b2313bb 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c @@ -3729,7 +3729,7 @@ int vmw_validate_single_buffer(struct vmw_private *dev_priv, { struct vmw_buffer_object *vbo = container_of(bo, struct vmw_buffer_object, base); - struct ttm_operation_ctx ctx = { interruptible, true }; + struct ttm_operation_ctx ctx = { interruptible, false }; int ret; if (vbo->pin_count > 0)

6 years, 7 months

1
0
0 0

FAILED: patch "[PATCH] scsi: target: iscsi: Use bin2hex instead of a" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 8c39e2699f8acb2e29782a834e56306da24937fe Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sun, 9 Sep 2018 04:09:27 +0000 Subject: [PATCH] scsi: target: iscsi: Use bin2hex instead of a re-implementation Signed-off-by: Vincent Pelletier <plr.vincent(a)gmail.com> Reviewed-by: Mike Christie <mchristi(a)redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c index 6c3b4c022894..4e680d753941 100644 --- a/drivers/target/iscsi/iscsi_target_auth.c +++ b/drivers/target/iscsi/iscsi_target_auth.c @@ -26,15 +26,6 @@ #include "iscsi_target_nego.h" #include "iscsi_target_auth.h" -static void chap_binaryhex_to_asciihex(char *dst, char *src, int src_len) -{ - int i; - - for (i = 0; i < src_len; i++) { - sprintf(&dst[i*2], "%02x", (int) src[i] & 0xff); - } -} - static int chap_gen_challenge( struct iscsi_conn *conn, int caller, @@ -50,7 +41,7 @@ static int chap_gen_challenge( ret = get_random_bytes_wait(chap->challenge, CHAP_CHALLENGE_LENGTH); if (unlikely(ret)) return ret; - chap_binaryhex_to_asciihex(challenge_asciihex, chap->challenge, + bin2hex(challenge_asciihex, chap->challenge, CHAP_CHALLENGE_LENGTH); /* * Set CHAP_C, and copy the generated challenge into c_str. @@ -289,7 +280,7 @@ static int chap_server_compute_md5( goto out; } - chap_binaryhex_to_asciihex(response, server_digest, MD5_SIGNATURE_SIZE); + bin2hex(response, server_digest, MD5_SIGNATURE_SIZE); pr_debug("[server] MD5 Server Digest: %s\n", response); if (memcmp(server_digest, client_digest, MD5_SIGNATURE_SIZE) != 0) { @@ -411,7 +402,7 @@ static int chap_server_compute_md5( /* * Convert response from binary hex to ascii hext. */ - chap_binaryhex_to_asciihex(response, digest, MD5_SIGNATURE_SIZE); + bin2hex(response, digest, MD5_SIGNATURE_SIZE); *nr_out_len += sprintf(nr_out_ptr + *nr_out_len, "CHAP_R=0x%s", response); *nr_out_len += 1;

6 years, 7 months

1
0
0 0

FAILED: patch "[PATCH] scsi: target: iscsi: Use bin2hex instead of a" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 8c39e2699f8acb2e29782a834e56306da24937fe Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sun, 9 Sep 2018 04:09:27 +0000 Subject: [PATCH] scsi: target: iscsi: Use bin2hex instead of a re-implementation Signed-off-by: Vincent Pelletier <plr.vincent(a)gmail.com> Reviewed-by: Mike Christie <mchristi(a)redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c index 6c3b4c022894..4e680d753941 100644 --- a/drivers/target/iscsi/iscsi_target_auth.c +++ b/drivers/target/iscsi/iscsi_target_auth.c @@ -26,15 +26,6 @@ #include "iscsi_target_nego.h" #include "iscsi_target_auth.h" -static void chap_binaryhex_to_asciihex(char *dst, char *src, int src_len) -{ - int i; - - for (i = 0; i < src_len; i++) { - sprintf(&dst[i*2], "%02x", (int) src[i] & 0xff); - } -} - static int chap_gen_challenge( struct iscsi_conn *conn, int caller, @@ -50,7 +41,7 @@ static int chap_gen_challenge( ret = get_random_bytes_wait(chap->challenge, CHAP_CHALLENGE_LENGTH); if (unlikely(ret)) return ret; - chap_binaryhex_to_asciihex(challenge_asciihex, chap->challenge, + bin2hex(challenge_asciihex, chap->challenge, CHAP_CHALLENGE_LENGTH); /* * Set CHAP_C, and copy the generated challenge into c_str. @@ -289,7 +280,7 @@ static int chap_server_compute_md5( goto out; } - chap_binaryhex_to_asciihex(response, server_digest, MD5_SIGNATURE_SIZE); + bin2hex(response, server_digest, MD5_SIGNATURE_SIZE); pr_debug("[server] MD5 Server Digest: %s\n", response); if (memcmp(server_digest, client_digest, MD5_SIGNATURE_SIZE) != 0) { @@ -411,7 +402,7 @@ static int chap_server_compute_md5( /* * Convert response from binary hex to ascii hext. */ - chap_binaryhex_to_asciihex(response, digest, MD5_SIGNATURE_SIZE); + bin2hex(response, digest, MD5_SIGNATURE_SIZE); *nr_out_len += sprintf(nr_out_ptr + *nr_out_len, "CHAP_R=0x%s", response); *nr_out_len += 1;

6 years, 7 months

1
0
0 0

[PATCH stable 4.18] bpf/verifier: disallow pointer subtraction

by Daniel Borkmann

From: Alexei Starovoitov <ast(a)kernel.org> commit dd066823db2ac4e22f721ec85190817b58059a54 upstream. Subtraction of pointers was accidentally allowed for unpriv programs by commit 82abbf8d2fc4. Revert that part of commit. Fixes: 82abbf8d2fc4 ("bpf: do not allow root to mangle valid pointers") Reported-by: Jann Horn <jannh(a)google.com> Acked-by: Daniel Borkmann <daniel(a)iogearbox.net> Signed-off-by: Alexei Starovoitov <ast(a)kernel.org> Signed-off-by: Daniel Borkmann <daniel(a)iogearbox.net> --- kernel/bpf/verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 63aaac5..adbe21c 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -3132,7 +3132,7 @@ static int adjust_reg_min_max_vals(struct bpf_verifier_env *env, * an arbitrary scalar. Disallow all math except * pointer subtraction */ - if (opcode == BPF_SUB){ + if (opcode == BPF_SUB && env->allow_ptr_leaks) { mark_reg_unknown(env, regs, insn->dst_reg); return 0; } -- 2.9.5

6 years, 7 months

2
1
0 0

Re: [PATCH] drm/syncobj: Don't leak fences when WAIT_FOR_SUBMIT is set

by Chris Wilson

Quoting Jason Ekstrand (2018-09-26 10:43:59) > On Wed, Sep 26, 2018 at 3:18 AM Chris Wilson <chris(a)chris-wilson.co.uk> wrote: > > Quoting Jason Ekstrand (2018-09-26 08:17:03) > > We attempt to get fences earlier in the hopes that everything will > > already have fences and no callbacks will be needed. If we do succeed > > in getting a fence, getting one a second time will result in a duplicate > > ref with no unref. This is causing memory leaks in Vulkan applications > > that create a lot of fences; playing for a few hours can, apparently, > > bring down the system. > > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107899 > > Signed-off-by: Jason Ekstrand <jason(a)jlekstrand.net> > > Cc: stable(a)vger.kernel.org > > --- > > drivers/gpu/drm/drm_syncobj.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/ > drm_syncobj.c > > index adb3cb27d31e..759278fef35a 100644 > > --- a/drivers/gpu/drm/drm_syncobj.c > > +++ b/drivers/gpu/drm/drm_syncobj.c > > @@ -97,6 +97,8 @@ static int drm_syncobj_fence_get_or_add_callback(struct > drm_syncobj *syncobj, > > { > > int ret; > > > > + WARN_ON(*fence); > > I would have just put if (*fence) return; since the function is tied to > the array_wait implementation. > > > I considered doing that but marginally liked this better. If you have a > preference, I'm happy to change itl. Patch works, the difference is insignificant, land the patch and close the bug. -Chris

6 years, 7 months

1
0
0 0

[PATCH 4.14 000/173] 4.14.72-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.72 release. There are 173 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 Sep 26 11:30:10 UTC 2018. 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.14.72-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.72-rc1 Benjamin Poirier <bpoirier(a)suse.com> e1000e: Fix check_for_link return value with autoneg off Benjamin Poirier <bpoirier(a)suse.com> e1000e: Fix link check race condition Benjamin Poirier <bpoirier(a)suse.com> Revert "e1000e: Separate signaling for link check/link up" Benjamin Poirier <bpoirier(a)suse.com> e1000e: Avoid missed interrupts following ICR read Benjamin Poirier <bpoirier(a)suse.com> e1000e: Fix queue interrupt re-raising in Other interrupt Benjamin Poirier <bpoirier(a)suse.com> Partial revert "e1000e: Avoid receiver overrun interrupt bursts" Benjamin Poirier <bpoirier(a)suse.com> e1000e: Remove Other from EIAC David Ahern <dsahern(a)gmail.com> net/ipv6: prevent use after free in ip6_route_mpath_notify Chris Wilson <chris(a)chris-wilson.co.uk> drm/i915: Apply the GTT write flush for all !llc machines Jaechul Lee <jcsing.lee(a)samsung.com> ASoC: samsung: Fix invalid argument when devm_gpiod_get is called Christophe Jaillet <christophe.jaillet(a)wanadoo.fr> ASoC: samsung: i2s: Fix error handling path in i2s_set_sysclk() Michal Simek <michal.simek(a)xilinx.com> earlycon: Remove hardcoded port->uartclk initialization in of_setup_earlycon Michal Simek <michal.simek(a)xilinx.com> earlycon: Initialize port->uartclk based on clock-frequency property Dan Carpenter <dan.carpenter(a)oracle.com> mei: bus: type promotion bug in mei_nfc_if_version() Mikko Perttunen <mperttunen(a)nvidia.com> clk: tegra: bpmp: Don't crash when a clock fails to register Douglas Anderson <dianders(a)chromium.org> pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant Douglas Anderson <dianders(a)chromium.org> pinctrl: msm: Fix msm_config_group_get() to be compliant Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> gpiolib: Respect error code of ->get_direction() Ming Lei <ming.lei(a)redhat.com> blk-mq: avoid to synchronize rcu inside blk_cleanup_queue() Ming Lei <ming.lei(a)redhat.com> blk-mq: only attempt to merge bio if there is rq in sw queue Bart Van Assche <bart.vanassche(a)wdc.com> IB/nes: Fix a compiler warning Dan Carpenter <dan.carpenter(a)oracle.com> drm/panel: type promotion bug in s6e8aa0_read_mtp_id() John Stultz <john.stultz(a)linaro.org> selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Hannes Reinecke <hare(a)suse.de> scsi: libfc: fixup 'sleeping function called from invalid context' Timo Wischer <twischer(a)de.adit-jv.com> ALSA: pcm: Fix snd_interval_refine first/last with open min/max Zhouyang Jia <jiazhouyang09(a)gmail.com> rtc: bq4802: add error handling for devm_ioremap Wei Lu <wei.lu2(a)amd.com> drm/amdkfd: Fix error codes in kfd_get_process Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> rcu: Fix grace-period hangs due to race with CPU offline Peter Rosin <peda(a)axentia.se> input: rohm_bu21023: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Peter Rosin <peda(a)axentia.se> mfd: 88pm860x-i2c: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> gpiolib: Mark gpio_suffixes array with __maybe_unused Wei Yongjun <weiyongjun1(a)huawei.com> gpio: pxa: Fix potential NULL dereference Tuomas Tynkkynen <tuomas(a)tuxera.com> staging: bcm2835-audio: Don't leak workqueue if open fails Suzuki K Poulose <suzuki.poulose(a)arm.com> coresight: ETM: Add support for Arm Cortex-A73 and Cortex-A35 Robin Murphy <robin.murphy(a)arm.com> coresight: tpiu: Fix disabling timeouts Suzuki K Poulose <suzuki.poulose(a)arm.com> coresight: Handle errors in finding input/output ports Quentin Perret <quentin.perret(a)arm.com> sched/fair: Fix util_avg of new tasks for asymmetric systems Julia Lawall <Julia.Lawall(a)lip6.fr> parport: sunbpp: fix error return code Thierry Reding <treding(a)nvidia.com> drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping Karol Herbst <karolherbst(a)gmail.com> drm/nouveau/debugfs: Wake up GPU before doing any reclocking Lyude Paul <lyude(a)redhat.com> drm/nouveau: Fix runtime PM leak in drm_open() Stefan Agner <stefan(a)agner.ch> mmc: sdhci: do not try to use 3.3V signaling if not supported Stefan Agner <stefan(a)agner.ch> mmc: tegra: prevent HS200 on Tegra 3 Laurentiu Tudor <laurentiu.tudor(a)nxp.com> mmc: sdhci-of-esdhc: set proper dma mask for ls104x chips Johan Hovold <johan(a)kernel.org> tty: fix termios input-speed encoding Johan Hovold <johan(a)kernel.org> tty: fix termios input-speed encoding when using BOTHER Enrico Scholz <enrico.scholz(a)sigma-chemnitz.de> gpu: ipu-v3: csi: pass back mbus_code_to_bus_cfg error codes Rick Farrington <ricardo.farrington(a)cavium.com> liquidio: fix hang when re-binding VF host drv after running DPDK VF driver Nicholas Mc Guire <hofrat(a)osadl.org> ARM: hisi: check of_iomap and fix missing of_node_put Nicholas Mc Guire <hofrat(a)osadl.org> ARM: hisi: fix error handling and missing of_node_put Nicholas Mc Guire <hofrat(a)osadl.org> ARM: hisi: handle of_iomap and fix missing of_node_put Ard Biesheuvel <ard.biesheuvel(a)linaro.org> efi/esrt: Only call efi_mem_reserve() for boot services memory Andrea Parri <andrea.parri(a)amarulasolutions.com> sched/core: Use smp_mb() in wake_woken_function() Tony Lindgren <tony(a)atomide.com> pinctrl: pinmux: Return selector to the pinctrl driver Tony Lindgren <tony(a)atomide.com> pinctrl: rza1: Fix selector use for groups and functions Mike Christie <mchristi(a)redhat.com> configfs: fix registered group removal Paul Burton <paul.burton(a)mips.com> MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads Eric Biggers <ebiggers(a)google.com> security: check for kstrdup() failure in lsm_append() Nicholas Mc Guire <hofrat(a)osadl.org> KVM: PPC: Book3S HV: Add of_node_put() in success path Matthew Garrett <mjg59(a)google.com> evm: Don't deadlock if a crypto algorithm is unavailable Philipp Puschmann <pp(a)emlix.com> Bluetooth: Use lock_sock_nested in bt_accept_enqueue Miklos Szeredi <mszeredi(a)redhat.com> vfs: fix freeze protection in mnt_want_write_file() for overlayfs Jann Horn <jannh(a)google.com> mtdchar: fix overflows in adjustment of `count` Ronny Chevalier <ronny.chevalier(a)hp.com> audit: fix use-after-free in audit_add_watch Viresh Kumar <viresh.kumar(a)linaro.org> arm64: dts: uniphier: Add missing cooling device properties for CPUs Noa Osherovich <noaos(a)mellanox.com> net/mlx5: Add missing SET_DRIVER_VERSION command translation Maciej W. Rozycki <macro(a)mips.com> binfmt_elf: Respect error return from `regset->active' Trond Myklebust <trondmy(a)gmail.com> NFSv4.1 fix infinite loop on I/O. Boris Ostrovsky <boris.ostrovsky(a)oracle.com> x86/EISA: Don't probe EISA bus for Xen PV guests Yabin Cui <yabinc(a)google.com> perf/core: Force USER_DS when recording user stack data Max Filippov <jcmvbkbc(a)gmail.com> xtensa: ISS: don't allocate memory in platform_setup Dan Carpenter <dan.carpenter(a)oracle.com> CIFS: fix wrapping bugs in num_entries() Dan Carpenter <dan.carpenter(a)oracle.com> cifs: prevent integer overflow in nxt_dir_entry() Oliver Neukum <oneukum(a)suse.com> Revert "cdc-acm: implement put_char() and flush_chars()" Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt() Ben Hutchings <ben.hutchings(a)codethink.co.uk> USB: yurex: Fix buffer over-read in yurex_write() Johan Hovold <johan(a)kernel.org> USB: serial: ti_usb_3410_5052: fix array underflow in completion handler Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: misc: uss720: Fix two sleep-in-atomic-context bugs Johan Hovold <johan(a)kernel.org> USB: serial: io_ti: fix array underflow in completion handler Alan Stern <stern(a)rowland.harvard.edu> USB: net2280: Fix erroneous synchronization change Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> usb: gadget: udc: renesas_usb3: fix maxpacket size of ep0 Maxence Duprès <xpros64(a)hotmail.fr> USB: add quirk for WORLDE Controller KS49 or Prodipe MIDI 49C USB controller Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: host: u132-hcd: Fix a sleep-in-atomic-context bug in u132_get_frame() Mathias Nyman <mathias.nyman(a)linux.intel.com> usb: Avoid use-after-free by flushing endpoints early in usb_set_interface() Oliver Neukum <oneukum(a)suse.com> usb: uas: add support for more quirk flags Tim Anderson <tsa(a)biglakesoftware.com> USB: Add quirk to support DJI CineSSD Tomas Winkler <tomas.winkler(a)intel.com> mei: bus: need to unlink client before freeing Alexander Usyskin <alexander.usyskin(a)intel.com> mei: ignore not found client in the enumeration Mathias Nyman <mathias.nyman(a)linux.intel.com> usb: Don't die twice if PCI xhci host is not responding in resume Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: Fix use after free for URB cancellation on a reallocated endpoint Gustavo A. R. Silva <gustavo(a)embeddedor.com> misc: hmc6352: fix potential Spectre v1 K. Y. Srinivasan <kys(a)microsoft.com> Tools: hv: Fix a bug in the key delete code Corey Minyard <cminyard(a)mvista.com> ipmi: Fix I2C client removal in the SSIF driver Andreas Kemnade <andreas(a)kemnade.info> mmc: omap_hsmmc: fix wakeirq handling on removal Ingo Franzki <ifranzki(a)linux.ibm.com> s390/crypto: Fix return code checking in cbc_paes_crypt() Aaron Knister <aaron.s.knister(a)nasa.gov> IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler Juergen Gross <jgross(a)suse.com> xen/netfront: fix waiting for xenbus state change Bin Yang <bin.yang(a)intel.com> pstore: Fix incorrect persistent ram buffer mapping Parav Pandit <parav(a)mellanox.com> RDMA/cma: Protect cma dev list with lock Xiao Liang <xiliang(a)redhat.com> xen-netfront: fix warn message as irq device name has '/' Joerg Roedel <jroedel(a)suse.de> x86/mm/pti: Add an overflow check to pti_clone_pmds() Jiang Biao <jiang.biao2(a)zte.com.cn> x86/pti: Check the return value of pti_user_pagetable_walk_pmd() Jiang Biao <jiang.biao2(a)zte.com.cn> x86/pti: Check the return value of pti_user_pagetable_walk_p4d() Michael Müller <michael(a)fds-team.de> crypto: sharah - Unregister correct algorithms for SAHARA 3 Hanna Hawa <hannah(a)marvell.com> dmaengine: mv_xor_v2: kill the tasklets upon exit Jae Hyun Yoo <jae.hyun.yoo(a)linux.intel.com> i2c: aspeed: Fix initial values of master and slave state Pingfan Liu <kernelfans(a)gmail.com> drivers/base: stop new probing during shutdown Christoffer Dall <christoffer.dall(a)arm.com> KVM: arm/arm64: Fix vgic init race Randy Dunlap <rdunlap(a)infradead.org> platform/x86: toshiba_acpi: Fix defined but not used build warnings Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: reset layer2 attribute on layer switch Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: fix race in used-buffer accounting Bhushan Shah <bshah(a)kde.org> ARM: dts: qcom: msm8974-hammerhead: increase load on l20 for sdhci Loic Poulain <loic.poulain(a)linaro.org> arm64: dts: qcom: db410c: Fix Bluetooth LED trigger Vitaly Kuznetsov <vkuznets(a)redhat.com> xen-netfront: fix queue name setting Jakub Kicinski <jakub.kicinski(a)netronome.com> nfp: avoid buffer leak when FW communication fails Ard Biesheuvel <ard.biesheuvel(a)linaro.org> efi/arm: preserve early mapping of UEFI memory map longer for BGRT Leonard Crestez <leonard.crestez(a)nxp.com> reset: imx7: Fix always writing bits as 0 Mark Rutland <mark.rutland(a)arm.com> arm64: fix possible spectre-v1 write in ptrace_hbp_set_event() YueHaibing <yuehaibing(a)huawei.com> wan/fsl_ucc_hdlc: use IS_ERR_VALUE() to check return value of qe_muram_alloc Piotr Sawicki <p.sawicki2(a)partner.samsung.com> Smack: Fix handling of IPv4 traffic received by PF_INET6 sockets Manikanta Pubbisetty <mpubbise(a)codeaurora.org> mac80211: restrict delayed tailroom needed decrement Paul Cercueil <paul(a)crapouillou.net> MIPS: jz4740: Bump zload address Oder Chiou <oder_chiou(a)realtek.com> ASoC: rt5514: Fix the issue of the delay volume applied Nicholas Mc Guire <hofrat(a)osadl.org> staging: bcm2835-camera: handle wait_for_completion_timeout return properly Nicholas Mc Guire <hofrat(a)osadl.org> staging: bcm2835-camera: fix timeout handling in wait_for_completion_timeout Nicholas Piggin <npiggin(a)gmail.com> powerpc/powernv: opal_put_chars partial write fix Mark Rutland <mark.rutland(a)arm.com> KVM: arm/arm64: vgic: Fix possible spectre-v1 write in vgic_mmio_write_apr() Sagi Grimberg <sagi(a)grimberg.me> nvme-rdma: unquiesce queues when deleting the controller Sandipan Das <sandipan(a)linux.ibm.com> perf powerpc: Fix callchain ip filtering Krzysztof Kozlowski <krzk(a)kernel.org> ARM: exynos: Clear global variable on init error path Fredrik Noring <noring(a)nocrew.org> fbdev: Distinguish between interlaced and progressive modes Daniel Mack <daniel(a)zonque.org> video: fbdev: pxafb: clear allocated memory for video modes Sandipan Das <sandipan(a)linux.ibm.com> perf powerpc: Fix callchain ip filtering when return address is in a register Randy Dunlap <rdunlap(a)infradead.org> fbdev/via: fix defined but not used warning Anton Vasilyev <vasilyev(a)ispras.ru> video: goldfishfb: fix memory leak on driver remove Jiri Olsa <jolsa(a)redhat.com> perf tools: Fix struct comm_str removal crash Dan Carpenter <dan.carpenter(a)oracle.com> fbdev: omapfb: off by one in omapfb_register_client() Jiri Olsa <jolsa(a)kernel.org> perf tools: Synthesize GROUP_DESC feature in pipe mode Bob Peterson <rpeterso(a)redhat.com> gfs2: Don't reject a supposedly full bitmap if we have blocks reserved Thomas Richter <tmricht(a)linux.ibm.com> perf test: Fix subtest number when showing results Todor Tomov <todor.tomov(a)linaro.org> media: ov5645: Supported external clock is 24MHz Randy Dunlap <rdunlap(a)infradead.org> mtd/maps: fix solutionengine.c printk format warnings Wei Yongjun <weiyongjun1(a)huawei.com> IB/ipoib: Fix error return code in ipoib_dev_init() Mike Snitzer <snitzer(a)redhat.com> block: allow max_discard_segments to be stacked Zhu Yanjun <yanjun.zhu(a)oracle.com> IB/rxe: Drop QP0 silently Hans Verkuil <hverkuil(a)xs4all.nl> media: videobuf2-core: check for q->error in vb2_core_qbuf() Felix Fietkau <nbd(a)nbd.name> MIPS: ath79: fix system restart John Keeping <john(a)metanate.com> dmaengine: pl330: fix irq race with terminate_all Krzysztof Ha?asa <khalasa(a)piap.pl> media: tw686x: Fix oops on buffer alloc failure Masahiro Yamada <yamada.masahiro(a)socionext.com> kbuild: add .DELETE_ON_ERROR special target Rajan Vaja <rajan.vaja(a)xilinx.com> clk: clk-fixed-factor: Clear OF_POPULATED flag in case of failure Mikko Perttunen <mperttunen(a)nvidia.com> clk: core: Potentially free connection id Nicholas Mc Guire <hofrat(a)osadl.org> clk: imx6ul: fix missing of_node_put() Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Special-case rindex for gfs2_grow YueHaibing <yuehaibing(a)huawei.com> amd-xgbe: use dma_mapping_error to check map errors YueHaibing <yuehaibing(a)huawei.com> xfrm: fix 'passing zero to ERR_PTR()' warning Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro Takashi Iwai <tiwai(a)suse.de> ALSA: msnd: Fix the default sample sizes Jean-Philippe Brucker <jean-philippe.brucker(a)arm.com> iommu/io-pgtable-arm-v7s: Abort allocation when table address overflows the PTE Miao Zhong <zhongmiao(a)hisilicon.com> iommu/arm-smmu-v3: sync the OVACKFLG to PRIQ consumer register Erich E. Hoover <ehoover(a)sweptlaser.com> usb: dwc3: change stream event enable bit back to 13 Takashi Iwai <tiwai(a)suse.de> hv/netvsc: Fix NULL dereference at single queue mode fallback Vincent Whitchurch <vincent.whitchurch(a)axis.com> tcp: really ignore MSG_ZEROCOPY if no SO_ZEROCOPY Haishuang Yan <yanhaishuang(a)cmss.chinamobile.com> erspan: return PACKET_REJECT when the appropriate tunnel is not found Haishuang Yan <yanhaishuang(a)cmss.chinamobile.com> erspan: fix error handling for erspan tunnel Vakul Garg <vakul.garg(a)nxp.com> net/tls: Set count of SG entries if sk_alloc_sg returns -ENOSPC Raed Salem <raeds(a)mellanox.com> net/mlx5: E-Switch, Fix memory leak when creating switchdev mode FDB tables Jack Morgenstein <jackm(a)dev.mellanox.co.il> net/mlx5: Fix debugfs cleanup in the device init/remove flow Huy Nguyen <huyn(a)mellanox.com> net/mlx5: Check for error in mlx5_attach_interface Cong Wang <xiyou.wangcong(a)gmail.com> rds: fix two RCU related problems Stefan Wahren <stefan.wahren(a)i2se.com> net: qca_spi: Fix race condition in spi transfers Jack Morgenstein <jackm(a)dev.mellanox.co.il> net/mlx5: Fix use-after-free in self-healing flow Petr Oros <poros(a)redhat.com> be2net: Fix memory leak in be_cmd_get_profile_config() ------------- Diffstat: Makefile | 4 +- .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 2 + arch/arm/mach-exynos/suspend.c | 1 + arch/arm/mach-hisi/hotplug.c | 41 +++++--- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 + arch/arm64/kernel/ptrace.c | 19 ++-- arch/mips/ath79/setup.c | 1 + arch/mips/include/asm/mach-ath79/ath79.h | 1 + arch/mips/jz4740/Platform | 2 +- arch/mips/loongson64/common/cs5536/cs5536_ohci.c | 2 +- arch/powerpc/kvm/book3s_hv.c | 2 + arch/powerpc/platforms/powernv/opal.c | 2 +- arch/s390/crypto/paes_s390.c | 2 +- arch/x86/kernel/eisa.c | 10 +- arch/x86/mm/pti.c | 25 ++++- arch/xtensa/platforms/iss/setup.c | 25 +++-- block/blk-core.c | 8 +- block/blk-mq-sched.c | 3 +- block/blk-settings.c | 2 +- crypto/api.c | 2 +- drivers/base/core.c | 3 + drivers/char/ipmi/ipmi_ssif.c | 19 ++-- drivers/clk/clk-fixed-factor.c | 9 +- drivers/clk/clk.c | 3 + drivers/clk/imx/clk-imx6ul.c | 1 + drivers/clk/tegra/clk-bpmp.c | 12 ++- drivers/crypto/sahara.c | 4 +- drivers/dma/mv_xor_v2.c | 2 + drivers/dma/pl330.c | 5 +- drivers/firmware/efi/arm-init.c | 1 - drivers/firmware/efi/arm-runtime.c | 4 +- drivers/firmware/efi/esrt.c | 3 +- drivers/gpio/gpio-pxa.c | 2 + drivers/gpio/gpiolib.c | 6 ++ drivers/gpio/gpiolib.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 + drivers/gpu/drm/i915/i915_gem.c | 4 +- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 4 + drivers/gpu/drm/nouveau/nouveau_drm.c | 6 +- drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 13 +++ drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 2 +- drivers/gpu/ipu-v3/ipu-csi.c | 20 +++- drivers/hwtracing/coresight/coresight-etm4x.c | 31 +++--- drivers/hwtracing/coresight/coresight-tpiu.c | 7 +- drivers/hwtracing/coresight/coresight.c | 7 +- drivers/i2c/busses/i2c-aspeed.c | 4 +- drivers/infiniband/core/cma.c | 12 ++- drivers/infiniband/hw/nes/nes.h | 2 +- drivers/infiniband/sw/rxe/rxe_recv.c | 9 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 + drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 +- drivers/input/touchscreen/rohm_bu21023.c | 4 +- drivers/iommu/arm-smmu-v3.c | 1 + drivers/iommu/io-pgtable-arm-v7s.c | 7 +- drivers/media/i2c/ov5645.c | 13 +-- drivers/media/pci/tw686x/tw686x-video.c | 11 ++- drivers/media/v4l2-core/videobuf2-core.c | 5 + drivers/mfd/88pm860x-i2c.c | 8 +- drivers/misc/hmc6352.c | 2 + drivers/misc/mei/bus-fixup.c | 2 +- drivers/misc/mei/bus.c | 9 +- drivers/misc/mei/hbm.c | 9 +- drivers/mmc/host/omap_hsmmc.c | 1 + drivers/mmc/host/sdhci-of-esdhc.c | 6 ++ drivers/mmc/host/sdhci-tegra.c | 3 +- drivers/mmc/host/sdhci.c | 9 +- drivers/mtd/maps/solutionengine.c | 6 +- drivers/mtd/mtdchar.c | 10 +- drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 7 +- .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 3 + .../ethernet/cavium/liquidio/cn23xx_vf_device.c | 3 + drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +- drivers/net/ethernet/intel/e1000e/defines.h | 21 +++- drivers/net/ethernet/intel/e1000e/ich8lan.c | 42 ++++---- drivers/net/ethernet/intel/e1000e/mac.c | 25 ++--- drivers/net/ethernet/intel/e1000e/netdev.c | 33 +++---- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 15 ++- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/health.c | 10 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 12 ++- .../net/ethernet/netronome/nfp/nfp_net_common.c | 13 ++- drivers/net/ethernet/qualcomm/qca_7k.c | 76 +++++++------- drivers/net/ethernet/qualcomm/qca_spi.c | 110 +++++++++++---------- drivers/net/ethernet/qualcomm/qca_spi.h | 5 - drivers/net/hyperv/rndis_filter.c | 2 +- drivers/net/wan/fsl_ucc_hdlc.c | 6 +- drivers/net/xen-netfront.c | 30 +++--- drivers/nvme/host/rdma.c | 2 + drivers/parport/parport_sunbpp.c | 8 +- drivers/pinctrl/pinctrl-rza1.c | 24 ++--- drivers/pinctrl/pinmux.c | 16 ++- drivers/pinctrl/qcom/pinctrl-msm.c | 14 ++- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 32 ++++-- drivers/platform/x86/toshiba_acpi.c | 3 +- drivers/reset/reset-imx7.c | 2 +- drivers/rtc/rtc-bq4802.c | 4 + drivers/s390/net/qeth_core_main.c | 3 +- drivers/s390/net/qeth_core_sys.c | 1 + drivers/scsi/libfc/fc_disc.c | 7 +- .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 16 +-- .../vc04_services/bcm2835-camera/bcm2835-camera.c | 7 +- .../vc04_services/bcm2835-camera/mmal-vchiq.c | 11 ++- drivers/tty/serial/earlycon.c | 5 +- drivers/tty/tty_baudrate.c | 13 ++- drivers/usb/class/cdc-acm.c | 73 -------------- drivers/usb/class/cdc-acm.h | 1 - drivers/usb/class/cdc-wdm.c | 2 +- drivers/usb/core/hcd-pci.c | 2 - drivers/usb/core/message.c | 11 +++ drivers/usb/core/quirks.c | 7 ++ drivers/usb/dwc3/gadget.h | 2 +- drivers/usb/gadget/udc/net2280.c | 16 ++- drivers/usb/gadget/udc/renesas_usb3.c | 5 +- drivers/usb/host/u132-hcd.c | 2 +- drivers/usb/host/xhci.c | 30 ++++++ drivers/usb/misc/uss720.c | 4 +- drivers/usb/misc/yurex.c | 5 +- drivers/usb/serial/io_ti.h | 2 +- drivers/usb/serial/ti_usb_3410_5052.c | 2 +- drivers/usb/storage/scsiglue.c | 9 ++ drivers/usb/storage/uas.c | 21 ++++ drivers/usb/storage/unusual_devs.h | 7 ++ drivers/video/fbdev/core/modedb.c | 41 +++++--- drivers/video/fbdev/goldfishfb.c | 1 + drivers/video/fbdev/omap/omapfb_main.c | 2 +- drivers/video/fbdev/pxafb.c | 4 +- drivers/video/fbdev/via/viafbdev.c | 3 +- fs/binfmt_elf.c | 2 +- fs/cifs/readdir.c | 11 ++- fs/cifs/smb2pdu.c | 25 +++-- fs/configfs/dir.c | 11 +++ fs/gfs2/bmap.c | 2 +- fs/gfs2/rgrp.c | 3 +- fs/namespace.c | 7 +- fs/nfs/nfs4proc.c | 10 +- fs/nfs/nfs4state.c | 2 + fs/pstore/ram_core.c | 17 +++- include/linux/crypto.h | 5 + include/linux/mlx5/driver.h | 2 +- kernel/audit_watch.c | 12 ++- kernel/events/core.c | 4 + kernel/rcu/tree.c | 6 ++ kernel/rcu/tree.h | 4 + kernel/sched/fair.c | 10 +- kernel/sched/wait.c | 47 ++++----- net/bluetooth/af_bluetooth.c | 2 +- net/core/skbuff.c | 3 - net/ipv4/ip_gre.c | 4 + net/ipv4/tcp.c | 2 +- net/ipv6/route.c | 13 ++- net/mac80211/cfg.c | 2 +- net/mac80211/key.c | 24 +++-- net/rds/bind.c | 5 +- net/tls/tls_sw.c | 6 ++ net/xfrm/xfrm_policy.c | 5 +- scripts/Kbuild.include | 3 + security/integrity/evm/evm_crypto.c | 3 +- security/security.c | 2 + security/smack/smack_lsm.c | 14 ++- sound/core/pcm_lib.c | 14 ++- sound/isa/msnd/msnd_pinnacle.c | 4 +- sound/soc/codecs/rt5514.c | 8 +- sound/soc/samsung/i2s.c | 5 +- sound/soc/samsung/tm2_wm5110.c | 3 +- sound/usb/quirks-table.h | 3 +- tools/hv/hv_kvp_daemon.c | 2 +- tools/perf/arch/powerpc/util/skip-callchain-idx.c | 10 +- tools/perf/tests/builtin-test.c | 2 +- tools/perf/util/comm.c | 16 ++- tools/perf/util/header.c | 2 +- tools/testing/selftests/timers/raw_skew.c | 5 + virt/kvm/arm/vgic/vgic-init.c | 4 + virt/kvm/arm/vgic/vgic-mmio-v2.c | 3 + 175 files changed, 1043 insertions(+), 611 deletions(-)

6 years, 7 months

9
185
0 0

FAILED: patch "[PATCH] spi: spi-fsl-dspi: fix broken DSPI_EOQ_MODE" failed to apply to 4.18-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 5223c9c1cbfc0cd4d0a1b50758e0949af3290fa1 Mon Sep 17 00:00:00 2001 From: Angelo Dureghello <angelo(a)sysam.it> Date: Sat, 18 Aug 2018 01:51:58 +0200 Subject: [PATCH] spi: spi-fsl-dspi: fix broken DSPI_EOQ_MODE This patch fixes the dspi_eoq_write function used by the ColdFire mcf5441x family. The 16 bit cmd part must be re-set at each data transfer. Also, now that fifo_size variables are used for eoq_read/write, a proper fifo size must be set (16 slots for the ColdFire dspi module version). Signed-off-by: Angelo Dureghello <angelo(a)sysam.it> Acked-by: Esben Haabendal <esben(a)haabendal.dk> Signed-off-by: Mark Brown <broonie(a)kernel.org> Cc: stable(a)vger.kernel.org diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 7cb3ab0a35a0..3082e72e4f6c 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -30,7 +30,11 @@ #define DRIVER_NAME "fsl-dspi" +#ifdef CONFIG_M5441x +#define DSPI_FIFO_SIZE 16 +#else #define DSPI_FIFO_SIZE 4 +#endif #define DSPI_DMA_BUFSIZE (DSPI_FIFO_SIZE * 1024) #define SPI_MCR 0x00 @@ -623,9 +627,11 @@ static void dspi_tcfq_read(struct fsl_dspi *dspi) static void dspi_eoq_write(struct fsl_dspi *dspi) { int fifo_size = DSPI_FIFO_SIZE; + u16 xfer_cmd = dspi->tx_cmd; /* Fill TX FIFO with as many transfers as possible */ while (dspi->len && fifo_size--) { + dspi->tx_cmd = xfer_cmd; /* Request EOQF for last transfer in FIFO */ if (dspi->len == dspi->bytes_per_word || fifo_size == 0) dspi->tx_cmd |= SPI_PUSHR_CMD_EOQ;

6 years, 7 months

1
0
0 0

FAILED: patch "[PATCH] mtd: partitions: fix unbalanced of_node_get/put()" failed to apply to 4.18-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 85516a9881a31e2c7a8d10f4697f3adcccc7cef1 Mon Sep 17 00:00:00 2001 From: Miquel Raynal <miquel.raynal(a)bootlin.com> Date: Fri, 7 Sep 2018 16:35:54 +0200 Subject: [PATCH] mtd: partitions: fix unbalanced of_node_get/put() While at first mtd_part_of_parse() would just call of_get_chil_by_name(), it has been patched to deal with sub-partitions and will now directly manipulate the node returned by mtd_get_of_node() if the MTD device is a partition. A of_node_put() was a bit below in the code, to balance the of_get_child_by_name(). However, despite its name, mtd_get_of_node() does not take a reference on the OF node. It is a simple helper hiding some pointer logic to retrieve the OF node related to an MTD device. The direct effect of such unbalanced reference counting is visible by rmmod'ing any module that would have added MTD partitions: OF: ERROR: Bad of_node_put() on <of_path_to_partition> As it seems normal to get a reference on the OF node during the of_property_for_each_string() that follows, add a call to of_node_get() when relevant. Fixes: 76a832254ab0 ("mtd: partitions: use DT info for parsing partitions with "compatible" prop") Cc: stable(a)vger.kernel.org Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> Signed-off-by: Boris Brezillon <boris.brezillon(a)bootlin.com> diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 52e2cb35fc79..99c460facd5e 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -873,8 +873,11 @@ static int mtd_part_of_parse(struct mtd_info *master, int ret, err = 0; np = mtd_get_of_node(master); - if (!mtd_is_partition(master)) + if (mtd_is_partition(master)) + of_node_get(np); + else np = of_get_child_by_name(np, "partitions"); + of_property_for_each_string(np, "compatible", prop, compat) { parser = mtd_part_get_compatible_parser(compat); if (!parser)

6 years, 7 months

1
0
0 0

[PATCH] drm: fix use of freed memory in drm_mode_setcrtc

by Tomi Valkeinen

drm_mode_setcrtc() retries modesetting in case one of the functions it calls returns -EDEADLK. connector_set, mode and fb are freed before retrying, but they are not set to NULL. This can cause drm_mode_setcrtc() to use those variables. For example: On the first try __drm_mode_set_config_internal() returns -EDEADLK. connector_set, mode and fb are freed. Next retry starts, and drm_modeset_lock_all_ctx() returns -EDEADLK, and we jump to 'out'. The code will happily try to release all three again. This leads to crashes of different kinds, depending on the sequence the EDEADLKs happen. Fix this by setting the three variables to NULL at the start of the retry loop. Signed-off-by: Tomi Valkeinen <tomi.valkeinen(a)ti.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/drm_crtc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 2f6c877299e4..2ad14593fb23 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -570,9 +570,9 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, struct drm_mode_crtc *crtc_req = data; struct drm_crtc *crtc; struct drm_plane *plane; - struct drm_connector **connector_set = NULL, *connector; - struct drm_framebuffer *fb = NULL; - struct drm_display_mode *mode = NULL; + struct drm_connector **connector_set, *connector; + struct drm_framebuffer *fb; + struct drm_display_mode *mode; struct drm_mode_set set; uint32_t __user *set_connectors_ptr; struct drm_modeset_acquire_ctx ctx; @@ -601,6 +601,10 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, mutex_lock(&crtc->dev->mode_config.mutex); drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE); retry: + connector_set = NULL; + fb = NULL; + mode = NULL; + ret = drm_modeset_lock_all_ctx(crtc->dev, &ctx); if (ret) goto out; -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

6 years, 7 months

3
4
0 0

FAILED: patch "[PATCH] ASoC: rsnd: fixup not to call clk_get/set under non-atomic" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 4d230d12710646788af581ba0155d83ab48b955c Mon Sep 17 00:00:00 2001 From: Jiada Wang <jiada_wang(a)mentor.com> Date: Mon, 3 Sep 2018 07:08:58 +0000 Subject: [PATCH] ASoC: rsnd: fixup not to call clk_get/set under non-atomic Clocking operations clk_get/set_rate, are non-atomic, they shouldn't be called in soc_pcm_trigger() which is atomic. Following issue was found due to execution of clk_get_rate() causes sleep in soc_pcm_trigger(), which shouldn't be blocked. We can reproduce this issue by following > enable CONFIG_DEBUG_ATOMIC_SLEEP=y > compile, and boot > mount -t debugfs none /sys/kernel/debug > while true; do cat /sys/kernel/debug/clk/clk_summary > /dev/null; done & > while true; do aplay xxx; done This patch adds support to .prepare callback, and moves non-atomic clocking operations to it. As .prepare is non-atomic, it is always called before trigger_start/trigger_stop. BUG: sleeping function called from invalid context at kernel/locking/mutex.c:620 in_atomic(): 1, irqs_disabled(): 128, pid: 2242, name: aplay INFO: lockdep is turned off. irq event stamp: 5964 hardirqs last enabled at (5963): [<ffff200008e59e40>] mutex_lock_nested+0x6e8/0x6f0 hardirqs last disabled at (5964): [<ffff200008e623f0>] _raw_spin_lock_irqsave+0x24/0x68 softirqs last enabled at (5502): [<ffff200008081838>] __do_softirq+0x560/0x10c0 softirqs last disabled at (5495): [<ffff2000080c2e78>] irq_exit+0x160/0x25c Preemption disabled at:[ 62.904063] [<ffff200008be4d48>] snd_pcm_stream_lock+0xb4/0xc0 CPU: 2 PID: 2242 Comm: aplay Tainted: G B C 4.9.54+ #186 Hardware name: Renesas Salvator-X board based on r8a7795 (DT) Call trace: [<ffff20000808fe48>] dump_backtrace+0x0/0x37c [<ffff2000080901d8>] show_stack+0x14/0x1c [<ffff2000086f4458>] dump_stack+0xfc/0x154 [<ffff2000081134a0>] ___might_sleep+0x57c/0x58c [<ffff2000081136b8>] __might_sleep+0x208/0x21c [<ffff200008e5980c>] mutex_lock_nested+0xb4/0x6f0 [<ffff2000087cac74>] clk_prepare_lock+0xb0/0x184 [<ffff2000087cb094>] clk_core_get_rate+0x14/0x54 [<ffff2000087cb0f4>] clk_get_rate+0x20/0x34 [<ffff20000113aa00>] rsnd_adg_ssi_clk_try_start+0x158/0x4f8 [snd_soc_rcar] [<ffff20000113da00>] rsnd_ssi_init+0x668/0x7a0 [snd_soc_rcar] [<ffff200001133ff4>] rsnd_soc_dai_trigger+0x4bc/0xcf8 [snd_soc_rcar] [<ffff200008c1af24>] soc_pcm_trigger+0x2a4/0x2d4 Fixes: e7d850dd10f4 ("ASoC: rsnd: use mod base common method on SSI-parent") Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> Signed-off-by: Timo Wischer <twischer(a)de.adit-jv.com> [Kuninori: tidyup for upstream] Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Tested-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> Cc: stable(a)vger.kernel.org diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index f8425d8b44d2..b35f5509cfe2 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -958,12 +958,23 @@ static void rsnd_soc_dai_shutdown(struct snd_pcm_substream *substream, rsnd_dai_stream_quit(io); } +static int rsnd_soc_dai_prepare(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct rsnd_priv *priv = rsnd_dai_to_priv(dai); + struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); + struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); + + return rsnd_dai_call(prepare, io, priv); +} + static const struct snd_soc_dai_ops rsnd_soc_dai_ops = { .startup = rsnd_soc_dai_startup, .shutdown = rsnd_soc_dai_shutdown, .trigger = rsnd_soc_dai_trigger, .set_fmt = rsnd_soc_dai_set_fmt, .set_tdm_slot = rsnd_soc_set_dai_tdm_slot, + .prepare = rsnd_soc_dai_prepare, }; void rsnd_parse_connect_common(struct rsnd_dai *rdai, diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 96d93330b1e1..8f7a0abfa751 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -280,6 +280,9 @@ struct rsnd_mod_ops { int (*nolock_stop)(struct rsnd_mod *mod, struct rsnd_dai_stream *io, struct rsnd_priv *priv); + int (*prepare)(struct rsnd_mod *mod, + struct rsnd_dai_stream *io, + struct rsnd_priv *priv); }; struct rsnd_dai_stream; @@ -309,6 +312,7 @@ struct rsnd_mod { * H 0: fallback * H 0: hw_params * H 0: pointer + * H 0: prepare */ #define __rsnd_mod_shift_nolock_start 0 #define __rsnd_mod_shift_nolock_stop 0 @@ -323,6 +327,7 @@ struct rsnd_mod { #define __rsnd_mod_shift_fallback 28 /* always called */ #define __rsnd_mod_shift_hw_params 28 /* always called */ #define __rsnd_mod_shift_pointer 28 /* always called */ +#define __rsnd_mod_shift_prepare 28 /* always called */ #define __rsnd_mod_add_probe 0 #define __rsnd_mod_add_remove 0 @@ -337,6 +342,7 @@ struct rsnd_mod { #define __rsnd_mod_add_fallback 0 #define __rsnd_mod_add_hw_params 0 #define __rsnd_mod_add_pointer 0 +#define __rsnd_mod_add_prepare 0 #define __rsnd_mod_call_probe 0 #define __rsnd_mod_call_remove 0 @@ -351,6 +357,7 @@ struct rsnd_mod { #define __rsnd_mod_call_pointer 0 #define __rsnd_mod_call_nolock_start 0 #define __rsnd_mod_call_nolock_stop 1 +#define __rsnd_mod_call_prepare 0 #define rsnd_mod_to_priv(mod) ((mod)->priv) #define rsnd_mod_name(mod) ((mod)->ops->name) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 8304e4ec9242..3f880ec66459 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -283,7 +283,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, if (rsnd_ssi_is_multi_slave(mod, io)) return 0; - if (ssi->usrcnt > 1) { + if (ssi->rate) { if (ssi->rate != rate) { dev_err(dev, "SSI parent/child should use same rate\n"); return -EINVAL; @@ -434,7 +434,6 @@ static int rsnd_ssi_init(struct rsnd_mod *mod, struct rsnd_priv *priv) { struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); - int ret; if (!rsnd_ssi_is_run_mods(mod, io)) return 0; @@ -443,10 +442,6 @@ static int rsnd_ssi_init(struct rsnd_mod *mod, rsnd_mod_power_on(mod); - ret = rsnd_ssi_master_clk_start(mod, io); - if (ret < 0) - return ret; - rsnd_ssi_config_init(mod, io); rsnd_ssi_register_setup(mod); @@ -852,6 +847,13 @@ static int rsnd_ssi_pio_pointer(struct rsnd_mod *mod, return 0; } +static int rsnd_ssi_prepare(struct rsnd_mod *mod, + struct rsnd_dai_stream *io, + struct rsnd_priv *priv) +{ + return rsnd_ssi_master_clk_start(mod, io); +} + static struct rsnd_mod_ops rsnd_ssi_pio_ops = { .name = SSI_NAME, .probe = rsnd_ssi_common_probe, @@ -864,6 +866,7 @@ static struct rsnd_mod_ops rsnd_ssi_pio_ops = { .pointer = rsnd_ssi_pio_pointer, .pcm_new = rsnd_ssi_pcm_new, .hw_params = rsnd_ssi_hw_params, + .prepare = rsnd_ssi_prepare, }; static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, @@ -940,6 +943,7 @@ static struct rsnd_mod_ops rsnd_ssi_dma_ops = { .pcm_new = rsnd_ssi_pcm_new, .fallback = rsnd_ssi_fallback, .hw_params = rsnd_ssi_hw_params, + .prepare = rsnd_ssi_prepare, }; int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod)

6 years, 7 months

1
0
0 0

FAILED: patch "[PATCH] ASoC: rt5682: Change DAC/ADC volume scale" failed to apply to 4.18-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 7509487785d7a2bf3606cf26710f0ca29e9ca94d Mon Sep 17 00:00:00 2001 From: Shuming Fan <shumingf(a)realtek.com> Date: Fri, 24 Aug 2018 10:52:19 +0800 Subject: [PATCH] ASoC: rt5682: Change DAC/ADC volume scale The step of DAC/ADC volume scale changes from 0.375dB to 0.75dB Signed-off-by: Shuming Fan <shumingf(a)realtek.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> Cc: stable(a)vger.kernel.org diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 640d400ca013..afe7d5b19313 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -750,8 +750,8 @@ static bool rt5682_readable_register(struct device *dev, unsigned int reg) } static const DECLARE_TLV_DB_SCALE(hp_vol_tlv, -2250, 150, 0); -static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -65625, 375, 0); -static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0); +static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -6525, 75, 0); +static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -1725, 75, 0); static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0); /* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */ @@ -1114,7 +1114,7 @@ static const struct snd_kcontrol_new rt5682_snd_controls[] = { /* DAC Digital Volume */ SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5682_DAC1_DIG_VOL, - RT5682_L_VOL_SFT, RT5682_R_VOL_SFT, 175, 0, dac_vol_tlv), + RT5682_L_VOL_SFT + 1, RT5682_R_VOL_SFT + 1, 86, 0, dac_vol_tlv), /* IN Boost Volume */ SOC_SINGLE_TLV("CBJ Boost Volume", RT5682_CBJ_BST_CTRL, @@ -1124,7 +1124,7 @@ static const struct snd_kcontrol_new rt5682_snd_controls[] = { SOC_DOUBLE("STO1 ADC Capture Switch", RT5682_STO1_ADC_DIG_VOL, RT5682_L_MUTE_SFT, RT5682_R_MUTE_SFT, 1, 1), SOC_DOUBLE_TLV("STO1 ADC Capture Volume", RT5682_STO1_ADC_DIG_VOL, - RT5682_L_VOL_SFT, RT5682_R_VOL_SFT, 127, 0, adc_vol_tlv), + RT5682_L_VOL_SFT + 1, RT5682_R_VOL_SFT + 1, 63, 0, adc_vol_tlv), /* ADC Boost Volume Control */ SOC_DOUBLE_TLV("STO1 ADC Boost Gain Volume", RT5682_STO1_ADC_BOOST,

6 years, 7 months

1
0
0 0

[PATCHES] Networking

by David Miller

Please queue up the following networking bug fixes for v4.14.x and v4.18.x -stable, respectively. Thank you!

6 years, 7 months

2
1
0 0

Linux 4.18.10

by Greg KH

I'm announcing the release of the 4.18.10 kernel. All users of the 4.18 kernel series must upgrade. The updated 4.18.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.18.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 29 +- arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 2 arch/arm/mach-exynos/suspend.c | 1 arch/arm/mach-hisi/hotplug.c | 41 ++- arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 arch/arm64/kernel/perf_event.c | 50 ++-- arch/arm64/kernel/ptrace.c | 19 + arch/mips/ath79/setup.c | 1 arch/mips/include/asm/mach-ath79/ath79.h | 1 arch/mips/jz4740/Platform | 2 arch/mips/loongson64/common/cs5536/cs5536_ohci.c | 2 arch/powerpc/kvm/book3s_64_vio.c | 5 arch/powerpc/kvm/book3s_hv.c | 2 arch/powerpc/platforms/powernv/opal.c | 2 arch/s390/crypto/paes_s390.c | 2 arch/x86/kernel/eisa.c | 10 arch/x86/mm/pti.c | 25 +- arch/xtensa/platforms/iss/setup.c | 25 +- block/blk-core.c | 8 block/blk-mq-sched.c | 3 block/blk-settings.c | 2 crypto/api.c | 2 drivers/base/core.c | 3 drivers/block/DAC960.c | 9 drivers/char/ipmi/ipmi_bt_sm.c | 92 ++++---- drivers/char/ipmi/ipmi_msghandler.c | 53 ++-- drivers/char/ipmi/ipmi_si_intf.c | 17 - drivers/char/ipmi/ipmi_ssif.c | 30 -- drivers/clk/clk-fixed-factor.c | 9 drivers/clk/clk.c | 3 drivers/clk/imx/clk-imx6sll.c | 1 drivers/clk/imx/clk-imx6ul.c | 1 drivers/clk/mvebu/armada-37xx-periph.c | 3 drivers/clk/tegra/clk-bpmp.c | 12 - drivers/crypto/ccp/psp-dev.c | 46 +++- drivers/crypto/sahara.c | 4 drivers/devfreq/devfreq.c | 4 drivers/dma/mv_xor_v2.c | 2 drivers/dma/pl330.c | 5 drivers/dma/sh/rcar-dmac.c | 5 drivers/firmware/efi/arm-init.c | 1 drivers/firmware/efi/arm-runtime.c | 4 drivers/firmware/efi/esrt.c | 3 drivers/gpio/gpio-pxa.c | 2 drivers/gpio/gpiolib.h | 2 drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 9 drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 9 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 8 drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 6 drivers/gpu/drm/nouveau/nouveau_debugfs.c | 4 drivers/gpu/drm/nouveau/nouveau_drm.c | 6 drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 13 + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 2 drivers/gpu/ipu-v3/ipu-csi.c | 20 + drivers/hv/vmbus_drv.c | 3 drivers/hwtracing/coresight/coresight-etm4x.c | 31 +- drivers/hwtracing/coresight/coresight-tpiu.c | 7 drivers/hwtracing/coresight/coresight.c | 7 drivers/i2c/busses/i2c-aspeed.c | 4 drivers/infiniband/core/cma.c | 12 - drivers/infiniband/hw/mlx5/cong.c | 9 drivers/infiniband/hw/mlx5/mr.c | 32 -- drivers/infiniband/sw/rxe/rxe_recv.c | 9 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 drivers/input/joystick/pxrc.c | 66 ++---- drivers/input/touchscreen/rohm_bu21023.c | 4 drivers/iommu/arm-smmu-v3.c | 1 drivers/iommu/io-pgtable-arm-v7s.c | 7 drivers/iommu/io-pgtable-arm.c | 3 drivers/iommu/ipmmu-vmsa.c | 8 drivers/lightnvm/pblk-init.c | 5 drivers/lightnvm/pblk-recovery.c | 5 drivers/md/dm-verity-target.c | 24 +- drivers/media/common/videobuf2/videobuf2-core.c | 5 drivers/media/i2c/ov5645.c | 13 - drivers/media/pci/tw686x/tw686x-video.c | 11 - drivers/mfd/88pm860x-i2c.c | 8 drivers/misc/hmc6352.c | 2 drivers/misc/ibmvmc.c | 2 drivers/misc/mei/bus-fixup.c | 2 drivers/misc/mei/bus.c | 12 - drivers/misc/mei/hbm.c | 9 drivers/mmc/host/meson-mx-sdio.c | 8 drivers/mmc/host/omap_hsmmc.c | 1 drivers/mmc/host/sdhci-of-esdhc.c | 6 drivers/mmc/host/sdhci-tegra.c | 3 drivers/mmc/host/sdhci.c | 9 drivers/mtd/maps/solutionengine.c | 6 drivers/mtd/mtdchar.c | 10 drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 7 drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c | 3 drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c | 3 drivers/net/ethernet/cortina/gemini.c | 5 drivers/net/ethernet/emulex/benet/be_cmds.c | 2 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 8 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 5 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 1 drivers/net/ethernet/mellanox/mlx5/core/dev.c | 15 - drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 1 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 76 +++--- drivers/net/ethernet/mellanox/mlx5/core/health.c | 10 drivers/net/ethernet/mellanox/mlx5/core/main.c | 12 - drivers/net/ethernet/mellanox/mlx5/core/wq.c | 4 drivers/net/ethernet/mellanox/mlx5/core/wq.h | 2 drivers/net/ethernet/netronome/nfp/nfp_main.c | 20 + drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 13 - drivers/net/ethernet/qualcomm/qca_7k.c | 76 +++--- drivers/net/ethernet/qualcomm/qca_spi.c | 110 +++++----- drivers/net/ethernet/qualcomm/qca_spi.h | 5 drivers/net/wan/fsl_ucc_hdlc.c | 6 drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 12 - drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 11 - drivers/net/xen-netfront.c | 30 +- drivers/nvme/host/rdma.c | 2 drivers/nvme/target/io-cmd-file.c | 18 - drivers/of/base.c | 28 ++ drivers/parport/parport_sunbpp.c | 8 drivers/pci/pcie/aer.c | 6 drivers/pinctrl/mediatek/pinctrl-mt7622.c | 4 drivers/pinctrl/pinctrl-rza1.c | 24 +- drivers/pinctrl/qcom/pinctrl-msm.c | 14 + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 32 ++ drivers/platform/x86/toshiba_acpi.c | 3 drivers/regulator/qcom_spmi-regulator.c | 34 +-- drivers/remoteproc/qcom_q6v5_pil.c | 1 drivers/reset/reset-imx7.c | 2 drivers/rtc/rtc-bq4802.c | 4 drivers/s390/net/qeth_core_main.c | 3 drivers/s390/net/qeth_core_sys.c | 1 drivers/scsi/libfc/fc_disc.c | 7 drivers/scsi/lpfc/lpfc_nvme.c | 5 drivers/scsi/lpfc/lpfc_nvmet.c | 12 + drivers/soc/qcom/smem.c | 10 drivers/spi/spi-dw.c | 3 drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 2 drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c | 16 - drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 7 drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c | 11 - drivers/tty/serial/8250/8250_of.c | 2 drivers/tty/tty_baudrate.c | 13 - drivers/usb/class/cdc-acm.c | 73 ------ drivers/usb/class/cdc-acm.h | 1 drivers/usb/class/cdc-wdm.c | 2 drivers/usb/core/hcd-pci.c | 2 drivers/usb/core/message.c | 11 + drivers/usb/core/quirks.c | 7 drivers/usb/dwc3/gadget.h | 2 drivers/usb/gadget/udc/net2280.c | 16 + drivers/usb/gadget/udc/renesas_usb3.c | 5 drivers/usb/host/u132-hcd.c | 2 drivers/usb/host/xhci-mem.c | 4 drivers/usb/host/xhci.c | 30 ++ drivers/usb/misc/uss720.c | 4 drivers/usb/misc/yurex.c | 5 drivers/usb/mtu3/mtu3_core.c | 6 drivers/usb/mtu3/mtu3_hw_regs.h | 1 drivers/usb/serial/io_ti.h | 2 drivers/usb/serial/ti_usb_3410_5052.c | 2 drivers/usb/storage/scsiglue.c | 9 drivers/usb/storage/uas.c | 21 + drivers/usb/storage/unusual_devs.h | 7 drivers/video/fbdev/core/modedb.c | 41 ++- drivers/video/fbdev/goldfishfb.c | 1 drivers/video/fbdev/omap/omapfb_main.c | 2 drivers/video/fbdev/omap2/omapfb/Makefile | 4 drivers/video/fbdev/pxafb.c | 4 drivers/video/fbdev/via/viafbdev.c | 3 fs/binfmt_elf.c | 2 fs/cifs/readdir.c | 11 - fs/cifs/smb2pdu.c | 29 +- fs/configfs/dir.c | 11 + fs/f2fs/super.c | 16 + fs/gfs2/bmap.c | 2 fs/gfs2/rgrp.c | 3 fs/namespace.c | 7 fs/nfs/nfs4proc.c | 10 fs/nfs/nfs4state.c | 2 fs/nfs/nfs4trace.h | 2 fs/overlayfs/super.c | 26 +- fs/pstore/ram_core.c | 17 + include/linux/crypto.h | 5 include/linux/mlx5/driver.h | 4 include/linux/of.h | 8 kernel/audit_watch.c | 12 + kernel/bpf/cgroup.c | 7 kernel/events/core.c | 4 kernel/rcu/rcutorture.c | 5 kernel/sched/fair.c | 10 kernel/sched/wait.c | 47 +--- net/bluetooth/af_bluetooth.c | 2 net/core/skbuff.c | 3 net/ipv4/ip_gre.c | 5 net/ipv4/tcp.c | 2 net/mac80211/cfg.c | 2 net/mac80211/key.c | 24 +- net/rds/bind.c | 5 net/tipc/socket.c | 1 net/tls/tls_sw.c | 14 + net/xfrm/xfrm_policy.c | 5 scripts/Kbuild.include | 3 security/integrity/evm/evm_crypto.c | 3 security/security.c | 2 security/smack/smack_lsm.c | 14 - sound/core/pcm_lib.c | 14 - sound/isa/msnd/msnd_pinnacle.c | 4 sound/soc/codecs/hdmi-codec.c | 21 + sound/soc/codecs/rt5514.c | 8 sound/soc/codecs/rt5651.c | 22 +- sound/soc/qcom/qdsp6/q6afe-dai.c | 2 sound/usb/quirks-table.h | 3 sound/usb/quirks.c | 2 tools/hv/hv_kvp_daemon.c | 2 tools/perf/arch/powerpc/util/skip-callchain-idx.c | 10 tools/perf/tests/builtin-test.c | 2 tools/perf/tests/shell/record+probe_libc_inet_pton.sh | 36 ++- tools/perf/util/comm.c | 16 + tools/perf/util/header.c | 2 tools/perf/util/machine.c | 9 tools/perf/util/map.c | 11 + tools/perf/util/unwind-libdw.c | 2 tools/perf/util/unwind-libunwind-local.c | 2 tools/testing/nvdimm/test/nfit.c | 3 tools/testing/selftests/android/ion/ionapp_export.c | 1 tools/testing/selftests/timers/raw_skew.c | 5 tools/testing/selftests/vDSO/vdso_test.c | 7 virt/kvm/arm/vgic/vgic-init.c | 4 virt/kvm/arm/vgic/vgic-mmio-v2.c | 3 233 files changed, 1562 insertions(+), 919 deletions(-) Aaron Knister (1): IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler Adrian Hunter (1): perf tools: Fix maps__find_symbol_by_name() Alan Stern (1): USB: net2280: Fix erroneous synchronization change Alexander Sverdlin (1): serial: 8250: of: Correct of_platform_serial_setup() error handling Alexander Usyskin (1): mei: ignore not found client in the enumeration Alexandre Belloni (1): spi: dw: fix possible race condition Alexandru Gagniuc (1): PCI/AER: Honor "pcie_ports=native" even if HEST sets FIRMWARE_FIRST Alexey Kardashevskiy (1): KVM: PPC: Book3S: Fix matching of hardware and emulated TCE tables Andrea Parri (1): sched/core: Use smp_mb() in wake_woken_function() Andreas Gruenbacher (1): gfs2: Special-case rindex for gfs2_grow Andreas Kemnade (1): mmc: omap_hsmmc: fix wakeirq handling on removal Andy Shevchenko (1): gpiolib: Mark gpio_suffixes array with __maybe_unused Anton Vasilyev (1): video: goldfishfb: fix memory leak on driver remove Ard Biesheuvel (2): efi/arm: preserve early mapping of UEFI memory map longer for BGRT efi/esrt: Only call efi_mem_reserve() for boot services memory Arnd Bergmann (2): omapfb: rename omap2 module to omap2fb.ko rcutorture: Use monotonic timestamp for stall detection Arvind Yadav (1): PM / devfreq: use put_device() instead of kfree() Ben Hutchings (1): USB: yurex: Fix buffer over-read in yurex_write() Bhushan Shah (1): ARM: dts: qcom: msm8974-hammerhead: increase load on l20 for sdhci Bin Yang (1): pstore: Fix incorrect persistent ram buffer mapping Bjorn Andersson (1): soc: qcom: smem: Correct check for global partition Bob Peterson (1): gfs2: Don't reject a supposedly full bitmap if we have blocks reserved Boris Ostrovsky (1): x86/EISA: Don't probe EISA bus for Xen PV guests Boris Pismenny (1): tls: Fix zerocopy_from_iter iov handling Brijesh Singh (1): crypto: ccp - add timeout support in the SEV command Bryant G. Ly (1): misc: ibmvsm: Fix wrong assignment of return code Christoffer Dall (1): KVM: arm/arm64: Fix vgic init race Chunfeng Yun (2): usb: xhci: fix interrupt transfer error happened on MTK platforms usb: mtu3: fix error of xhci port id when enable U3 dual role Cong Wang (2): rds: fix two RCU related problems tipc: orphan sock in tipc_release() Corey Minyard (3): ipmi: Rework SMI registration failure ipmi: Move BT capabilities detection to the detect call ipmi: Fix I2C client removal in the SSIF driver Dan Carpenter (7): fbdev: omapfb: off by one in omapfb_register_client() cifs: prevent integer overflow in nxt_dir_entry() CIFS: fix wrapping bugs in num_entries() cifs: integer overflow in in SMB2_ioctl() ASoC: qdsp6: q6afe-dai: fix a range check in of_q6afe_parse_dai_data() drm/panel: type promotion bug in s6e8aa0_read_mtp_id() mei: bus: type promotion bug in mei_nfc_if_version() Dan Williams (1): tools/testing/nvdimm: Fix support for emulating controller temperature Daniel Mack (1): video: fbdev: pxafb: clear allocated memory for video modes Dmitry Torokhov (1): Input: pxrc - fix freeing URB on device teardown Douglas Anderson (2): pinctrl: msm: Fix msm_config_group_get() to be compliant pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant Enrico Scholz (1): gpu: ipu-v3: csi: pass back mbus_code_to_bus_cfg error codes Eric Biggers (1): security: check for kstrdup() failure in lsm_append() Eric Yang (1): drm/amd/display: support access ddc for mst branch Erich E. Hoover (1): usb: dwc3: change stream event enable bit back to 13 Felix Fietkau (1): MIPS: ath79: fix system restart Fredrik Noring (1): fbdev: Distinguish between interlaced and progressive modes Golan Ben Ami (1): iwlwifi: cancel the injective function between hw pointers to tfd entry index Greg Kroah-Hartman (1): Linux 4.18.10 Gregory CLEMENT (1): clk: mvebu: armada-37xx-periph: Fix wrong return value in get_parent Gustavo A. R. Silva (1): misc: hmc6352: fix potential Spectre v1 Haishuang Yan (2): erspan: fix error handling for erspan tunnel erspan: return PACKET_REJECT when the appropriate tunnel is not found Hanna Hawa (1): dmaengine: mv_xor_v2: kill the tasklets upon exit Hannes Reinecke (1): scsi: libfc: fixup 'sleeping function called from invalid context' Hans Holmberg (1): lightnvm: pblk: assume that chunks are closed on 1.2 devices Hans Verkuil (1): media: videobuf2-core: check for q->error in vb2_core_qbuf() Hans de Goede (1): ASoC: rt5651: Fix workqueue cancel vs irq free race on remove Harry Wentland (1): drm/amd/pp: Send khz clock values to DC for smu7/8 Huazhong Tan (2): net: hns3: Reset net device with rtnl_lock net: hns3: Fix return value error in hns3_reset_notify_down_enet Huy Nguyen (1): net/mlx5: Check for error in mlx5_attach_interface Ingo Franzki (1): s390/crypto: Fix return code checking in cbc_paes_crypt() Ioana Radulescu (1): staging: fsl-dpaa2/eth: Fix DMA mapping direction Jack Morgenstein (2): net/mlx5: Fix use-after-free in self-healing flow net/mlx5: Fix debugfs cleanup in the device init/remove flow Jae Hyun Yoo (1): i2c: aspeed: Fix initial values of master and slave state Jaegeuk Kim (1): f2fs: do checkpoint in kill_sb Jakub Kicinski (2): nfp: don't fail probe on pci_sriov_set_totalvfs() errors nfp: avoid buffer leak when FW communication fails James Smart (2): scsi: lpfc: Fix NVME Target crash in defer rcv logic scsi: lpfc: Fix panic if driver unloaded when port is offline Jann Horn (2): mtdchar: fix overflows in adjustment of `count` IB/mlx5: fix uaccess beyond "count" in debugfs read/write handlers Jean-Philippe Brucker (2): iommu/io-pgtable-arm-v7s: Abort allocation when table address overflows the PTE iommu/io-pgtable-arm: Fix pgtable allocation in selftest Jeff Crukley (1): ALSA: usb-audio: Add support for Encore mDSD USB DAC Jia-Ju Bai (3): usb: host: u132-hcd: Fix a sleep-in-atomic-context bug in u132_get_frame() usb: misc: uss720: Fix two sleep-in-atomic-context bugs usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt() Jiang Biao (2): x86/pti: Check the return value of pti_user_pagetable_walk_p4d() x86/pti: Check the return value of pti_user_pagetable_walk_pmd() Jiri Olsa (2): perf tools: Synthesize GROUP_DESC feature in pipe mode perf tools: Fix struct comm_str removal crash Joerg Roedel (1): x86/mm/pti: Add an overflow check to pti_clone_pmds() Johan Hovold (6): USB: serial: io_ti: fix array underflow in completion handler USB: serial: ti_usb_3410_5052: fix array underflow in completion handler of: add helper to lookup compatible child node mmc: meson-mx-sdio: fix OF child-node lookup tty: fix termios input-speed encoding when using BOTHER tty: fix termios input-speed encoding John Keeping (1): dmaengine: pl330: fix irq race with terminate_all John Stultz (1): selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Juergen Gross (1): xen/netfront: fix waiting for xenbus state change Julia Lawall (1): parport: sunbpp: fix error return code Julian Wiedmann (2): s390/qeth: fix race in used-buffer accounting s390/qeth: reset layer2 attribute on layer switch K. Y. Srinivasan (1): Tools: hv: Fix a bug in the key delete code Karol Herbst (1): drm/nouveau/debugfs: Wake up GPU before doing any reclocking Krzysztof Ha?asa (1): media: tw686x: Fix oops on buffer alloc failure Krzysztof Kozlowski (1): ARM: exynos: Clear global variable on init error path Laurentiu Tudor (1): mmc: sdhci-of-esdhc: set proper dma mask for ls104x chips Leonard Crestez (1): reset: imx7: Fix always writing bits as 0 Li Zhijian (1): selftests/android: initialize heap_type to avoid compiling warning Linus Walleij (1): net: gemini: Allow multiple ports to instantiate Loic Poulain (1): arm64: dts: qcom: db410c: Fix Bluetooth LED trigger Lyude Paul (1): drm/nouveau: Fix runtime PM leak in drm_open() Maciej W. Rozycki (1): binfmt_elf: Respect error return from `regset->active' Manikanta Pubbisetty (1): mac80211: restrict delayed tailroom needed decrement Mark Rutland (2): KVM: arm/arm64: vgic: Fix possible spectre-v1 write in vgic_mmio_write_apr() arm64: fix possible spectre-v1 write in ptrace_hbp_set_event() Masahiro Yamada (2): kbuild: add .DELETE_ON_ERROR special target kbuild: do not update config when running install targets Mathias Nyman (3): xhci: Fix use after free for URB cancellation on a reallocated endpoint usb: Don't die twice if PCI xhci host is not responding in resume usb: Avoid use-after-free by flushing endpoints early in usb_set_interface() Matias Bjørling (1): lightnvm: pblk: enable line minor version detection Matthew Garrett (1): evm: Don't deadlock if a crypto algorithm is unavailable Max Filippov (1): xtensa: ISS: don't allocate memory in platform_setup Maxence Duprès (1): USB: add quirk for WORLDE Controller KS49 or Prodipe MIDI 49C USB controller Maxime Chevallier (1): net: mvpp2: make sure we use single queue mode on PPv2.1 Miao Zhong (1): iommu/arm-smmu-v3: sync the OVACKFLG to PRIQ consumer register Michael Müller (1): crypto: sharah - Unregister correct algorithms for SAHARA 3 Mike Christie (1): configfs: fix registered group removal Mike Snitzer (1): block: allow max_discard_segments to be stacked Mikko Perttunen (2): clk: core: Potentially free connection id clk: tegra: bpmp: Don't crash when a clock fails to register Miklos Szeredi (2): ovl: fix oopses in ovl_fill_super() failure paths vfs: fix freeze protection in mnt_want_write_file() for overlayfs Mikulas Patocka (1): dm verity: fix crash on bufio buffer that was allocated with vmalloc Ming Lei (2): blk-mq: only attempt to merge bio if there is rq in sw queue blk-mq: avoid to synchronize rcu inside blk_cleanup_queue() Nicholas Mc Guire (8): clk: imx6ul: fix missing of_node_put() clk: imx6sll: fix missing of_node_put() staging: bcm2835-camera: fix timeout handling in wait_for_completion_timeout staging: bcm2835-camera: handle wait_for_completion_timeout return properly KVM: PPC: Book3S HV: Add of_node_put() in success path ARM: hisi: handle of_iomap and fix missing of_node_put ARM: hisi: fix error handling and missing of_node_put ARM: hisi: check of_iomap and fix missing of_node_put Nicholas Piggin (1): powerpc/powernv: opal_put_chars partial write fix Niklas Cassel (2): regulator: qcom_spmi: Use correct regmap when checking for error regulator: qcom_spmi: Fix warning Bad of_node_put() Noa Osherovich (1): net/mlx5: Add missing SET_DRIVER_VERSION command translation Oder Chiou (1): ASoC: rt5514: Fix the issue of the delay volume applied Oliver Neukum (2): usb: uas: add support for more quirk flags Revert "cdc-acm: implement put_char() and flush_chars()" Parav Pandit (1): RDMA/cma: Protect cma dev list with lock Paul Burton (1): MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads Paul Cercueil (1): MIPS: jz4740: Bump zload address Peter Rosin (2): mfd: 88pm860x-i2c: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) input: rohm_bu21023: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Petr Oros (1): be2net: Fix memory leak in be_cmd_get_profile_config() Philipp Puschmann (1): Bluetooth: Use lock_sock_nested in bt_accept_enqueue Pingfan Liu (1): drivers/base: stop new probing during shutdown Piotr Sawicki (1): Smack: Fix handling of IPv4 traffic received by PF_INET6 sockets Quentin Perret (1): sched/fair: Fix util_avg of new tasks for asymmetric systems Raed Salem (1): net/mlx5: E-Switch, Fix memory leak when creating switchdev mode FDB tables Rajan Vaja (1): clk: clk-fixed-factor: Clear OF_POPULATED flag in case of failure Randy Dunlap (4): mtd/maps: fix solutionengine.c printk format warnings fbdev/via: fix defined but not used warning platform/x86: toshiba_acpi: Fix defined but not used build warnings block/DAC960.c: fix defined but not used build warnings Rex Zhu (1): drm/amd/pp: Set Max clock level to display by default Rick Farrington (1): liquidio: fix hang when re-binding VF host drv after running DPDK VF driver Rob Herring (1): of: fix phandle cache creation for DTs with no phandles Robin Murphy (1): coresight: tpiu: Fix disabling timeouts Roi Dayan (2): net/mlx5: Fix not releasing read lock when adding flow rules net/mlx5: Fix possible deadlock from lockdep when adding fte to fg Roman Gushchin (1): bpf: fix rcu annotations in compute_effective_progs() Ronny Chevalier (1): audit: fix use-after-free in audit_add_watch Russell King (1): ASoC: hdmi-codec: fix routing Ryder Lee (1): arm64: dts: mt7622: update a clock property for UART0 Sagi Grimberg (2): nvmet: fix file discard return status nvme-rdma: unquiesce queues when deleting the controller Sandipan Das (6): perf tests: Fix record+probe_libc_inet_pton.sh for powerpc64 perf tests: Fix record+probe_libc_inet_pton.sh when event exists perf tests: Fix record+probe_libc_inet_pton.sh to ensure cleanups perf powerpc: Fix callchain ip filtering when return address is in a register perf powerpc: Fix callchain ip filtering perf script: Show correct offsets for DWARF-based unwinding Sean Wang (1): pinctrl: mt7622: Fix probe fail by misuse the selector Shaoyun Liu (1): drm/amdkfd: Fix kernel queue 64 bit doorbell offset calculation Shuah Khan (Samsung OSG) (1): selftests: vDSO - fix to return KSFT_SKIP when test couldn't be run Sibi Sankar (1): remoteproc: qcom: q6v5-pil: fix modem hang on SDM845 after axis2 clk unvote Stefan Agner (2): mmc: tegra: prevent HS200 on Tegra 3 mmc: sdhci: do not try to use 3.3V signaling if not supported Stefan Wahren (1): net: qca_spi: Fix race condition in spi transfers Stephen Hemminger (1): vmbus: don't return values for uninitalized channels Suzuki K Poulose (3): coresight: Handle errors in finding input/output ports coresight: ETM: Add support for Arm Cortex-A73 and Cortex-A35 arm64: perf: Disable PMU while processing counter overflows Takashi Iwai (2): ALSA: msnd: Fix the default sample sizes ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro Tariq Toukan (1): net/mlx5: Use u16 for Work Queue buffer fragment size Thierry Reding (1): drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping Thomas Richter (1): perf test: Fix subtest number when showing results Tim Anderson (1): USB: Add quirk to support DJI CineSSD Timo Wischer (1): ALSA: pcm: Fix snd_interval_refine first/last with open min/max Todor Tomov (1): media: ov5645: Supported external clock is 24MHz Tomas Winkler (2): mei: bus: fix hw module get/put balance mei: bus: need to unlink client before freeing Tony Lindgren (1): pinctrl: rza1: Fix selector use for groups and functions Trond Myklebust (2): NFSv4: Fix a tracepoint Oops in initiate_file_draining() NFSv4.1 fix infinite loop on I/O. Tuomas Tynkkynen (1): staging: bcm2835-audio: Don't leak workqueue if open fails Vakul Garg (1): net/tls: Set count of SG entries if sk_alloc_sg returns -ENOSPC Vincent Whitchurch (1): tcp: really ignore MSG_ZEROCOPY if no SO_ZEROCOPY Viresh Kumar (1): arm64: dts: uniphier: Add missing cooling device properties for CPUs Vitaly Kuznetsov (1): xen-netfront: fix queue name setting Wei Lu (1): drm/amdkfd: Fix error codes in kfd_get_process Wei Yongjun (2): IB/ipoib: Fix error return code in ipoib_dev_init() gpio: pxa: Fix potential NULL dereference Xiao Liang (1): xen-netfront: fix warn message as irq device name has '/' Yabin Cui (1): perf/core: Force USER_DS when recording user stack data Yoshihiro Shimoda (3): iommu/ipmmu-vmsa: IMUCTRn.TTSEL needs a special usage on R-Car Gen3 usb: gadget: udc: renesas_usb3: fix maxpacket size of ep0 dmaengine: sh: rcar-dmac: avoid to write CHCR.TE to 1 if TCR is set to 0 Yue Wang (1): ALSA: usb-audio: Generic DSD detection for Thesycon-based implementations YueHaibing (3): xfrm: fix 'passing zero to ERR_PTR()' warning amd-xgbe: use dma_mapping_error to check map errors wan/fsl_ucc_hdlc: use IS_ERR_VALUE() to check return value of qe_muram_alloc Yunsheng Lin (1): net: hns3: Fix for reset_level default assignment probelm Zhouyang Jia (1): rtc: bq4802: add error handling for devm_ioremap Zhu Yanjun (1): IB/rxe: Drop QP0 silently

6 years, 7 months

1
1
0 0

Linux 4.14.72

by Greg KH

I'm announcing the release of the 4.14.72 kernel. All users of the 4.14 kernel series must upgrade. The updated 4.14.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 2 arch/arm/mach-exynos/suspend.c | 1 arch/arm/mach-hisi/hotplug.c | 41 ++- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 arch/arm64/kernel/ptrace.c | 19 + arch/mips/ath79/setup.c | 1 arch/mips/include/asm/mach-ath79/ath79.h | 1 arch/mips/jz4740/Platform | 2 arch/mips/loongson64/common/cs5536/cs5536_ohci.c | 2 arch/powerpc/kvm/book3s_hv.c | 2 arch/powerpc/platforms/powernv/opal.c | 2 arch/s390/crypto/paes_s390.c | 2 arch/x86/kernel/eisa.c | 10 arch/x86/mm/pti.c | 25 +- arch/xtensa/platforms/iss/setup.c | 25 +- block/blk-core.c | 8 block/blk-mq-sched.c | 3 block/blk-settings.c | 2 crypto/api.c | 2 drivers/base/core.c | 3 drivers/char/ipmi/ipmi_ssif.c | 19 - drivers/clk/clk-fixed-factor.c | 9 drivers/clk/clk.c | 3 drivers/clk/imx/clk-imx6ul.c | 1 drivers/clk/tegra/clk-bpmp.c | 12 - drivers/crypto/sahara.c | 4 drivers/dma/mv_xor_v2.c | 2 drivers/dma/pl330.c | 5 drivers/firmware/efi/arm-init.c | 1 drivers/firmware/efi/arm-runtime.c | 4 drivers/firmware/efi/esrt.c | 3 drivers/gpio/gpio-pxa.c | 2 drivers/gpio/gpiolib.h | 2 drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 drivers/gpu/drm/i915/i915_gem.c | 4 drivers/gpu/drm/nouveau/nouveau_debugfs.c | 4 drivers/gpu/drm/nouveau/nouveau_drm.c | 6 drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 13 + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 2 drivers/gpu/ipu-v3/ipu-csi.c | 20 + drivers/hwtracing/coresight/coresight-etm4x.c | 31 +- drivers/hwtracing/coresight/coresight-tpiu.c | 7 drivers/hwtracing/coresight/coresight.c | 7 drivers/i2c/busses/i2c-aspeed.c | 4 drivers/infiniband/core/cma.c | 12 - drivers/infiniband/sw/rxe/rxe_recv.c | 9 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 drivers/input/touchscreen/rohm_bu21023.c | 4 drivers/iommu/arm-smmu-v3.c | 1 drivers/iommu/io-pgtable-arm-v7s.c | 7 drivers/media/i2c/ov5645.c | 13 - drivers/media/pci/tw686x/tw686x-video.c | 11 - drivers/media/v4l2-core/videobuf2-core.c | 5 drivers/mfd/88pm860x-i2c.c | 8 drivers/misc/hmc6352.c | 2 drivers/misc/mei/bus-fixup.c | 2 drivers/misc/mei/bus.c | 9 drivers/misc/mei/hbm.c | 9 drivers/mmc/host/omap_hsmmc.c | 1 drivers/mmc/host/sdhci-of-esdhc.c | 6 drivers/mmc/host/sdhci-tegra.c | 3 drivers/mmc/host/sdhci.c | 9 drivers/mtd/maps/solutionengine.c | 6 drivers/mtd/mtdchar.c | 10 drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 7 drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c | 3 drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c | 3 drivers/net/ethernet/emulex/benet/be_cmds.c | 2 drivers/net/ethernet/intel/e1000e/defines.h | 21 + drivers/net/ethernet/intel/e1000e/ich8lan.c | 42 +-- drivers/net/ethernet/intel/e1000e/mac.c | 25 -- drivers/net/ethernet/intel/e1000e/netdev.c | 33 +-- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 1 drivers/net/ethernet/mellanox/mlx5/core/dev.c | 15 - drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 1 drivers/net/ethernet/mellanox/mlx5/core/health.c | 10 drivers/net/ethernet/mellanox/mlx5/core/main.c | 12 - drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 13 - drivers/net/ethernet/qualcomm/qca_7k.c | 76 +++--- drivers/net/ethernet/qualcomm/qca_spi.c | 110 +++++----- drivers/net/ethernet/qualcomm/qca_spi.h | 5 drivers/net/hyperv/rndis_filter.c | 2 drivers/net/wan/fsl_ucc_hdlc.c | 6 drivers/net/xen-netfront.c | 30 +- drivers/nvme/host/rdma.c | 2 drivers/parport/parport_sunbpp.c | 8 drivers/pinctrl/pinctrl-rza1.c | 24 +- drivers/pinctrl/qcom/pinctrl-msm.c | 14 + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 32 ++ drivers/platform/x86/toshiba_acpi.c | 3 drivers/reset/reset-imx7.c | 2 drivers/rtc/rtc-bq4802.c | 4 drivers/s390/net/qeth_core_main.c | 3 drivers/s390/net/qeth_core_sys.c | 1 drivers/scsi/libfc/fc_disc.c | 7 drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c | 16 - drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 7 drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c | 11 - drivers/tty/serial/earlycon.c | 5 drivers/tty/tty_baudrate.c | 13 - drivers/usb/class/cdc-acm.c | 73 ------ drivers/usb/class/cdc-acm.h | 1 drivers/usb/class/cdc-wdm.c | 2 drivers/usb/core/hcd-pci.c | 2 drivers/usb/core/message.c | 11 + drivers/usb/core/quirks.c | 7 drivers/usb/dwc3/gadget.h | 2 drivers/usb/gadget/udc/net2280.c | 16 + drivers/usb/gadget/udc/renesas_usb3.c | 5 drivers/usb/host/u132-hcd.c | 2 drivers/usb/host/xhci.c | 30 ++ drivers/usb/misc/uss720.c | 4 drivers/usb/misc/yurex.c | 5 drivers/usb/serial/io_ti.h | 2 drivers/usb/serial/ti_usb_3410_5052.c | 2 drivers/usb/storage/scsiglue.c | 9 drivers/usb/storage/uas.c | 21 + drivers/usb/storage/unusual_devs.h | 7 drivers/video/fbdev/core/modedb.c | 41 ++- drivers/video/fbdev/goldfishfb.c | 1 drivers/video/fbdev/omap/omapfb_main.c | 2 drivers/video/fbdev/pxafb.c | 4 drivers/video/fbdev/via/viafbdev.c | 3 fs/binfmt_elf.c | 2 fs/cifs/readdir.c | 11 - fs/cifs/smb2pdu.c | 25 +- fs/configfs/dir.c | 11 + fs/gfs2/bmap.c | 2 fs/gfs2/rgrp.c | 3 fs/namespace.c | 7 fs/nfs/nfs4proc.c | 10 fs/nfs/nfs4state.c | 2 fs/pstore/ram_core.c | 17 + include/linux/crypto.h | 5 include/linux/mlx5/driver.h | 2 kernel/audit_watch.c | 12 + kernel/events/core.c | 4 kernel/sched/fair.c | 10 kernel/sched/wait.c | 47 +--- net/bluetooth/af_bluetooth.c | 2 net/core/skbuff.c | 3 net/ipv4/ip_gre.c | 4 net/ipv4/tcp.c | 2 net/ipv6/route.c | 13 - net/mac80211/cfg.c | 2 net/mac80211/key.c | 24 +- net/rds/bind.c | 5 net/tls/tls_sw.c | 6 net/xfrm/xfrm_policy.c | 5 scripts/Kbuild.include | 3 security/integrity/evm/evm_crypto.c | 3 security/security.c | 2 security/smack/smack_lsm.c | 14 - sound/core/pcm_lib.c | 14 - sound/isa/msnd/msnd_pinnacle.c | 4 sound/soc/codecs/rt5514.c | 8 sound/soc/samsung/i2s.c | 5 sound/soc/samsung/tm2_wm5110.c | 3 sound/usb/quirks-table.h | 3 tools/hv/hv_kvp_daemon.c | 2 tools/perf/arch/powerpc/util/skip-callchain-idx.c | 10 tools/perf/tests/builtin-test.c | 2 tools/perf/util/comm.c | 16 + tools/perf/util/header.c | 2 tools/testing/selftests/timers/raw_skew.c | 5 virt/kvm/arm/vgic/vgic-init.c | 4 virt/kvm/arm/vgic/vgic-mmio-v2.c | 3 170 files changed, 1013 insertions(+), 605 deletions(-) Aaron Knister (1): IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler Alan Stern (1): USB: net2280: Fix erroneous synchronization change Alexander Usyskin (1): mei: ignore not found client in the enumeration Andrea Parri (1): sched/core: Use smp_mb() in wake_woken_function() Andreas Gruenbacher (1): gfs2: Special-case rindex for gfs2_grow Andreas Kemnade (1): mmc: omap_hsmmc: fix wakeirq handling on removal Andy Shevchenko (1): gpiolib: Mark gpio_suffixes array with __maybe_unused Anton Vasilyev (1): video: goldfishfb: fix memory leak on driver remove Ard Biesheuvel (2): efi/arm: preserve early mapping of UEFI memory map longer for BGRT efi/esrt: Only call efi_mem_reserve() for boot services memory Ben Hutchings (1): USB: yurex: Fix buffer over-read in yurex_write() Benjamin Poirier (7): e1000e: Remove Other from EIAC Partial revert "e1000e: Avoid receiver overrun interrupt bursts" e1000e: Fix queue interrupt re-raising in Other interrupt e1000e: Avoid missed interrupts following ICR read Revert "e1000e: Separate signaling for link check/link up" e1000e: Fix link check race condition e1000e: Fix check_for_link return value with autoneg off Bhushan Shah (1): ARM: dts: qcom: msm8974-hammerhead: increase load on l20 for sdhci Bin Yang (1): pstore: Fix incorrect persistent ram buffer mapping Bob Peterson (1): gfs2: Don't reject a supposedly full bitmap if we have blocks reserved Boris Ostrovsky (1): x86/EISA: Don't probe EISA bus for Xen PV guests Chris Wilson (1): drm/i915: Apply the GTT write flush for all !llc machines Christoffer Dall (1): KVM: arm/arm64: Fix vgic init race Christophe Jaillet (1): ASoC: samsung: i2s: Fix error handling path in i2s_set_sysclk() Cong Wang (1): rds: fix two RCU related problems Corey Minyard (1): ipmi: Fix I2C client removal in the SSIF driver Dan Carpenter (5): fbdev: omapfb: off by one in omapfb_register_client() cifs: prevent integer overflow in nxt_dir_entry() CIFS: fix wrapping bugs in num_entries() drm/panel: type promotion bug in s6e8aa0_read_mtp_id() mei: bus: type promotion bug in mei_nfc_if_version() Daniel Mack (1): video: fbdev: pxafb: clear allocated memory for video modes David Ahern (1): net/ipv6: prevent use after free in ip6_route_mpath_notify Douglas Anderson (2): pinctrl: msm: Fix msm_config_group_get() to be compliant pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant Enrico Scholz (1): gpu: ipu-v3: csi: pass back mbus_code_to_bus_cfg error codes Eric Biggers (1): security: check for kstrdup() failure in lsm_append() Erich E. Hoover (1): usb: dwc3: change stream event enable bit back to 13 Felix Fietkau (1): MIPS: ath79: fix system restart Fredrik Noring (1): fbdev: Distinguish between interlaced and progressive modes Greg Kroah-Hartman (1): Linux 4.14.72 Gustavo A. R. Silva (1): misc: hmc6352: fix potential Spectre v1 Haishuang Yan (2): erspan: fix error handling for erspan tunnel erspan: return PACKET_REJECT when the appropriate tunnel is not found Hanna Hawa (1): dmaengine: mv_xor_v2: kill the tasklets upon exit Hannes Reinecke (1): scsi: libfc: fixup 'sleeping function called from invalid context' Hans Verkuil (1): media: videobuf2-core: check for q->error in vb2_core_qbuf() Huy Nguyen (1): net/mlx5: Check for error in mlx5_attach_interface Ingo Franzki (1): s390/crypto: Fix return code checking in cbc_paes_crypt() Jack Morgenstein (2): net/mlx5: Fix use-after-free in self-healing flow net/mlx5: Fix debugfs cleanup in the device init/remove flow Jae Hyun Yoo (1): i2c: aspeed: Fix initial values of master and slave state Jaechul Lee (1): ASoC: samsung: Fix invalid argument when devm_gpiod_get is called Jakub Kicinski (1): nfp: avoid buffer leak when FW communication fails Jann Horn (1): mtdchar: fix overflows in adjustment of `count` Jean-Philippe Brucker (1): iommu/io-pgtable-arm-v7s: Abort allocation when table address overflows the PTE Jia-Ju Bai (3): usb: host: u132-hcd: Fix a sleep-in-atomic-context bug in u132_get_frame() usb: misc: uss720: Fix two sleep-in-atomic-context bugs usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt() Jiang Biao (2): x86/pti: Check the return value of pti_user_pagetable_walk_p4d() x86/pti: Check the return value of pti_user_pagetable_walk_pmd() Jiri Olsa (2): perf tools: Synthesize GROUP_DESC feature in pipe mode perf tools: Fix struct comm_str removal crash Joerg Roedel (1): x86/mm/pti: Add an overflow check to pti_clone_pmds() Johan Hovold (4): USB: serial: io_ti: fix array underflow in completion handler USB: serial: ti_usb_3410_5052: fix array underflow in completion handler tty: fix termios input-speed encoding when using BOTHER tty: fix termios input-speed encoding John Keeping (1): dmaengine: pl330: fix irq race with terminate_all John Stultz (1): selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Juergen Gross (1): xen/netfront: fix waiting for xenbus state change Julia Lawall (1): parport: sunbpp: fix error return code Julian Wiedmann (2): s390/qeth: fix race in used-buffer accounting s390/qeth: reset layer2 attribute on layer switch K. Y. Srinivasan (1): Tools: hv: Fix a bug in the key delete code Karol Herbst (1): drm/nouveau/debugfs: Wake up GPU before doing any reclocking Krzysztof Ha?asa (1): media: tw686x: Fix oops on buffer alloc failure Krzysztof Kozlowski (1): ARM: exynos: Clear global variable on init error path Laurentiu Tudor (1): mmc: sdhci-of-esdhc: set proper dma mask for ls104x chips Leonard Crestez (1): reset: imx7: Fix always writing bits as 0 Loic Poulain (1): arm64: dts: qcom: db410c: Fix Bluetooth LED trigger Lyude Paul (1): drm/nouveau: Fix runtime PM leak in drm_open() Maciej W. Rozycki (1): binfmt_elf: Respect error return from `regset->active' Manikanta Pubbisetty (1): mac80211: restrict delayed tailroom needed decrement Mark Rutland (2): KVM: arm/arm64: vgic: Fix possible spectre-v1 write in vgic_mmio_write_apr() arm64: fix possible spectre-v1 write in ptrace_hbp_set_event() Masahiro Yamada (1): kbuild: add .DELETE_ON_ERROR special target Mathias Nyman (3): xhci: Fix use after free for URB cancellation on a reallocated endpoint usb: Don't die twice if PCI xhci host is not responding in resume usb: Avoid use-after-free by flushing endpoints early in usb_set_interface() Matthew Garrett (1): evm: Don't deadlock if a crypto algorithm is unavailable Max Filippov (1): xtensa: ISS: don't allocate memory in platform_setup Maxence Duprès (1): USB: add quirk for WORLDE Controller KS49 or Prodipe MIDI 49C USB controller Miao Zhong (1): iommu/arm-smmu-v3: sync the OVACKFLG to PRIQ consumer register Michael Müller (1): crypto: sharah - Unregister correct algorithms for SAHARA 3 Michal Simek (2): earlycon: Initialize port->uartclk based on clock-frequency property earlycon: Remove hardcoded port->uartclk initialization in of_setup_earlycon Mike Christie (1): configfs: fix registered group removal Mike Snitzer (1): block: allow max_discard_segments to be stacked Mikko Perttunen (2): clk: core: Potentially free connection id clk: tegra: bpmp: Don't crash when a clock fails to register Miklos Szeredi (1): vfs: fix freeze protection in mnt_want_write_file() for overlayfs Ming Lei (2): blk-mq: only attempt to merge bio if there is rq in sw queue blk-mq: avoid to synchronize rcu inside blk_cleanup_queue() Nicholas Mc Guire (7): clk: imx6ul: fix missing of_node_put() staging: bcm2835-camera: fix timeout handling in wait_for_completion_timeout staging: bcm2835-camera: handle wait_for_completion_timeout return properly KVM: PPC: Book3S HV: Add of_node_put() in success path ARM: hisi: handle of_iomap and fix missing of_node_put ARM: hisi: fix error handling and missing of_node_put ARM: hisi: check of_iomap and fix missing of_node_put Nicholas Piggin (1): powerpc/powernv: opal_put_chars partial write fix Noa Osherovich (1): net/mlx5: Add missing SET_DRIVER_VERSION command translation Oder Chiou (1): ASoC: rt5514: Fix the issue of the delay volume applied Oliver Neukum (2): usb: uas: add support for more quirk flags Revert "cdc-acm: implement put_char() and flush_chars()" Parav Pandit (1): RDMA/cma: Protect cma dev list with lock Paul Burton (1): MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads Paul Cercueil (1): MIPS: jz4740: Bump zload address Peter Rosin (2): mfd: 88pm860x-i2c: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) input: rohm_bu21023: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Petr Oros (1): be2net: Fix memory leak in be_cmd_get_profile_config() Philipp Puschmann (1): Bluetooth: Use lock_sock_nested in bt_accept_enqueue Pingfan Liu (1): drivers/base: stop new probing during shutdown Piotr Sawicki (1): Smack: Fix handling of IPv4 traffic received by PF_INET6 sockets Quentin Perret (1): sched/fair: Fix util_avg of new tasks for asymmetric systems Raed Salem (1): net/mlx5: E-Switch, Fix memory leak when creating switchdev mode FDB tables Rajan Vaja (1): clk: clk-fixed-factor: Clear OF_POPULATED flag in case of failure Randy Dunlap (3): mtd/maps: fix solutionengine.c printk format warnings fbdev/via: fix defined but not used warning platform/x86: toshiba_acpi: Fix defined but not used build warnings Rick Farrington (1): liquidio: fix hang when re-binding VF host drv after running DPDK VF driver Robin Murphy (1): coresight: tpiu: Fix disabling timeouts Ronny Chevalier (1): audit: fix use-after-free in audit_add_watch Sagi Grimberg (1): nvme-rdma: unquiesce queues when deleting the controller Sandipan Das (2): perf powerpc: Fix callchain ip filtering when return address is in a register perf powerpc: Fix callchain ip filtering Stefan Agner (2): mmc: tegra: prevent HS200 on Tegra 3 mmc: sdhci: do not try to use 3.3V signaling if not supported Stefan Wahren (1): net: qca_spi: Fix race condition in spi transfers Suzuki K Poulose (2): coresight: Handle errors in finding input/output ports coresight: ETM: Add support for Arm Cortex-A73 and Cortex-A35 Takashi Iwai (3): hv/netvsc: Fix NULL dereference at single queue mode fallback ALSA: msnd: Fix the default sample sizes ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro Thierry Reding (1): drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping Thomas Richter (1): perf test: Fix subtest number when showing results Tim Anderson (1): USB: Add quirk to support DJI CineSSD Timo Wischer (1): ALSA: pcm: Fix snd_interval_refine first/last with open min/max Todor Tomov (1): media: ov5645: Supported external clock is 24MHz Tomas Winkler (1): mei: bus: need to unlink client before freeing Tony Lindgren (1): pinctrl: rza1: Fix selector use for groups and functions Trond Myklebust (1): NFSv4.1 fix infinite loop on I/O. Tuomas Tynkkynen (1): staging: bcm2835-audio: Don't leak workqueue if open fails Vakul Garg (1): net/tls: Set count of SG entries if sk_alloc_sg returns -ENOSPC Vincent Whitchurch (1): tcp: really ignore MSG_ZEROCOPY if no SO_ZEROCOPY Viresh Kumar (1): arm64: dts: uniphier: Add missing cooling device properties for CPUs Vitaly Kuznetsov (1): xen-netfront: fix queue name setting Wei Lu (1): drm/amdkfd: Fix error codes in kfd_get_process Wei Yongjun (2): IB/ipoib: Fix error return code in ipoib_dev_init() gpio: pxa: Fix potential NULL dereference Xiao Liang (1): xen-netfront: fix warn message as irq device name has '/' Yabin Cui (1): perf/core: Force USER_DS when recording user stack data Yoshihiro Shimoda (1): usb: gadget: udc: renesas_usb3: fix maxpacket size of ep0 YueHaibing (3): xfrm: fix 'passing zero to ERR_PTR()' warning amd-xgbe: use dma_mapping_error to check map errors wan/fsl_ucc_hdlc: use IS_ERR_VALUE() to check return value of qe_muram_alloc Zhouyang Jia (1): rtc: bq4802: add error handling for devm_ioremap Zhu Yanjun (1): IB/rxe: Drop QP0 silently

6 years, 7 months

1
1
0 0

Linux 4.9.129

by Greg KH

I'm announcing the release of the 4.9.129 kernel. All users of the 4.9 kernel series must upgrade. The updated 4.9.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 2 arch/arm/mach-exynos/suspend.c | 1 arch/arm/mach-hisi/hotplug.c | 41 +++++--- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 arch/mips/ath79/setup.c | 1 arch/mips/include/asm/mach-ath79/ath79.h | 1 arch/mips/jz4740/Platform | 2 arch/mips/kernel/vdso.c | 20 ++++ arch/mips/loongson64/common/cs5536/cs5536_ohci.c | 2 arch/powerpc/platforms/powernv/opal.c | 2 crypto/api.c | 2 drivers/base/core.c | 3 drivers/clk/clk-fixed-factor.c | 9 + drivers/clk/imx/clk-imx6ul.c | 1 drivers/crypto/sahara.c | 4 drivers/dma/mv_xor_v2.c | 2 drivers/dma/pl330.c | 5 - drivers/firmware/efi/arm-init.c | 1 drivers/firmware/efi/arm-runtime.c | 4 drivers/firmware/efi/esrt.c | 3 drivers/gpio/gpio-pxa.c | 2 drivers/gpio/gpiolib.h | 2 drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 13 ++ drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 2 drivers/gpu/ipu-v3/ipu-csi.c | 20 +++- drivers/hwtracing/coresight/coresight-tpiu.c | 7 - drivers/hwtracing/coresight/coresight.c | 7 + drivers/infiniband/core/cma.c | 12 +- drivers/infiniband/sw/rxe/rxe_recv.c | 9 + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 drivers/input/touchscreen/rohm_bu21023.c | 4 drivers/iommu/arm-smmu-v3.c | 1 drivers/media/pci/tw686x/tw686x-video.c | 11 +- drivers/media/v4l2-core/videobuf2-core.c | 5 + drivers/mfd/88pm860x-i2c.c | 8 - drivers/misc/hmc6352.c | 2 drivers/misc/mei/bus-fixup.c | 2 drivers/misc/mei/hbm.c | 9 + drivers/mmc/host/omap_hsmmc.c | 1 drivers/mmc/host/sdhci-tegra.c | 3 drivers/mmc/host/sdhci.c | 9 + drivers/mtd/maps/solutionengine.c | 6 - drivers/mtd/mtdchar.c | 10 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 2 drivers/net/ethernet/intel/e1000e/defines.h | 21 ++++ drivers/net/ethernet/intel/e1000e/ich8lan.c | 44 ++++----- drivers/net/ethernet/intel/e1000e/mac.c | 27 ++--- drivers/net/ethernet/intel/e1000e/netdev.c | 33 ++---- drivers/net/ethernet/mellanox/mlx5/core/health.c | 10 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 10 +- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 13 ++ drivers/net/wan/fsl_ucc_hdlc.c | 6 - drivers/net/xen-netfront.c | 30 ++---- drivers/parport/parport_sunbpp.c | 8 + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 32 ++++-- drivers/platform/x86/toshiba_acpi.c | 3 drivers/rtc/rtc-bq4802.c | 4 drivers/s390/net/qeth_core_main.c | 3 drivers/s390/net/qeth_core_sys.c | 1 drivers/usb/class/cdc-acm.c | 73 --------------- drivers/usb/class/cdc-acm.h | 1 drivers/usb/class/cdc-wdm.c | 2 drivers/usb/core/hcd-pci.c | 2 drivers/usb/core/message.c | 11 ++ drivers/usb/core/quirks.c | 7 + drivers/usb/gadget/udc/net2280.c | 16 ++- drivers/usb/gadget/udc/renesas_usb3.c | 5 - drivers/usb/host/u132-hcd.c | 2 drivers/usb/misc/uss720.c | 4 drivers/usb/misc/yurex.c | 5 - drivers/usb/serial/io_ti.h | 2 drivers/usb/serial/ti_usb_3410_5052.c | 2 drivers/usb/storage/scsiglue.c | 9 + drivers/usb/storage/uas.c | 21 ++++ drivers/usb/storage/unusual_devs.h | 7 + drivers/video/fbdev/core/modedb.c | 41 ++++++-- drivers/video/fbdev/goldfishfb.c | 1 drivers/video/fbdev/omap/omapfb_main.c | 2 drivers/video/fbdev/pxafb.c | 4 drivers/video/fbdev/via/viafbdev.c | 3 fs/binfmt_elf.c | 2 fs/cifs/readdir.c | 11 +- fs/cifs/smb2pdu.c | 25 +++-- fs/configfs/dir.c | 11 ++ fs/gfs2/bmap.c | 2 fs/gfs2/rgrp.c | 3 fs/nfs/nfs4proc.c | 10 +- fs/nfs/nfs4state.c | 2 fs/pstore/ram_core.c | 17 ++- include/linux/crypto.h | 5 + include/linux/mlx5/driver.h | 2 kernel/audit_watch.c | 12 ++ kernel/events/core.c | 4 net/mac80211/cfg.c | 2 net/mac80211/key.c | 24 +++- net/rds/bind.c | 5 - net/xfrm/xfrm_policy.c | 5 - scripts/Kbuild.include | 3 security/integrity/evm/evm_crypto.c | 3 security/smack/smack_lsm.c | 14 +- sound/core/pcm_lib.c | 14 ++ sound/isa/msnd/msnd_pinnacle.c | 4 sound/usb/quirks-table.h | 3 tools/hv/hv_kvp_daemon.c | 2 tools/perf/arch/powerpc/util/skip-callchain-idx.c | 10 +- tools/perf/tests/builtin-test.c | 2 tools/testing/selftests/timers/raw_skew.c | 5 + virt/kvm/arm/vgic/vgic-init.c | 4 110 files changed, 607 insertions(+), 325 deletions(-) Aaron Knister (1): IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler Alan Stern (1): USB: net2280: Fix erroneous synchronization change Alexander Usyskin (1): mei: ignore not found client in the enumeration Andreas Gruenbacher (1): gfs2: Special-case rindex for gfs2_grow Andreas Kemnade (1): mmc: omap_hsmmc: fix wakeirq handling on removal Andy Shevchenko (1): gpiolib: Mark gpio_suffixes array with __maybe_unused Anton Vasilyev (1): video: goldfishfb: fix memory leak on driver remove Ard Biesheuvel (2): efi/arm: preserve early mapping of UEFI memory map longer for BGRT efi/esrt: Only call efi_mem_reserve() for boot services memory Ben Hutchings (1): USB: yurex: Fix buffer over-read in yurex_write() Benjamin Poirier (6): e1000e: Remove Other from EIAC Partial revert "e1000e: Avoid receiver overrun interrupt bursts" e1000e: Fix queue interrupt re-raising in Other interrupt e1000e: Avoid missed interrupts following ICR read Revert "e1000e: Separate signaling for link check/link up" e1000e: Fix link check race condition Bhushan Shah (1): ARM: dts: qcom: msm8974-hammerhead: increase load on l20 for sdhci Bin Yang (1): pstore: Fix incorrect persistent ram buffer mapping Bob Peterson (1): gfs2: Don't reject a supposedly full bitmap if we have blocks reserved Christoffer Dall (1): KVM: arm/arm64: Fix vgic init race Cong Wang (1): rds: fix two RCU related problems Dan Carpenter (5): fbdev: omapfb: off by one in omapfb_register_client() cifs: prevent integer overflow in nxt_dir_entry() CIFS: fix wrapping bugs in num_entries() drm/panel: type promotion bug in s6e8aa0_read_mtp_id() mei: bus: type promotion bug in mei_nfc_if_version() Daniel Mack (1): video: fbdev: pxafb: clear allocated memory for video modes Douglas Anderson (1): pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant Enrico Scholz (1): gpu: ipu-v3: csi: pass back mbus_code_to_bus_cfg error codes Felix Fietkau (1): MIPS: ath79: fix system restart Fredrik Noring (1): fbdev: Distinguish between interlaced and progressive modes Greg Kroah-Hartman (1): Linux 4.9.129 Gustavo A. R. Silva (1): misc: hmc6352: fix potential Spectre v1 Hanna Hawa (1): dmaengine: mv_xor_v2: kill the tasklets upon exit Hans Verkuil (1): media: videobuf2-core: check for q->error in vb2_core_qbuf() Jack Morgenstein (2): net/mlx5: Fix use-after-free in self-healing flow net/mlx5: Fix debugfs cleanup in the device init/remove flow Jakub Kicinski (1): nfp: avoid buffer leak when FW communication fails Jann Horn (1): mtdchar: fix overflows in adjustment of `count` Jia-Ju Bai (3): usb: host: u132-hcd: Fix a sleep-in-atomic-context bug in u132_get_frame() usb: misc: uss720: Fix two sleep-in-atomic-context bugs usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt() Johan Hovold (2): USB: serial: io_ti: fix array underflow in completion handler USB: serial: ti_usb_3410_5052: fix array underflow in completion handler John Keeping (1): dmaengine: pl330: fix irq race with terminate_all John Stultz (1): selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Juergen Gross (1): xen/netfront: fix waiting for xenbus state change Julia Lawall (1): parport: sunbpp: fix error return code Julian Wiedmann (2): s390/qeth: fix race in used-buffer accounting s390/qeth: reset layer2 attribute on layer switch K. Y. Srinivasan (1): Tools: hv: Fix a bug in the key delete code Krzysztof Ha?asa (1): media: tw686x: Fix oops on buffer alloc failure Krzysztof Kozlowski (1): ARM: exynos: Clear global variable on init error path Loic Poulain (1): arm64: dts: qcom: db410c: Fix Bluetooth LED trigger Maciej W. Rozycki (1): binfmt_elf: Respect error return from `regset->active' Manikanta Pubbisetty (1): mac80211: restrict delayed tailroom needed decrement Masahiro Yamada (1): kbuild: add .DELETE_ON_ERROR special target Mathias Nyman (2): usb: Don't die twice if PCI xhci host is not responding in resume usb: Avoid use-after-free by flushing endpoints early in usb_set_interface() Matthew Garrett (1): evm: Don't deadlock if a crypto algorithm is unavailable Maxence Duprès (1): USB: add quirk for WORLDE Controller KS49 or Prodipe MIDI 49C USB controller Miao Zhong (1): iommu/arm-smmu-v3: sync the OVACKFLG to PRIQ consumer register Michael Müller (1): crypto: sharah - Unregister correct algorithms for SAHARA 3 Mike Christie (1): configfs: fix registered group removal Nicholas Mc Guire (4): clk: imx6ul: fix missing of_node_put() ARM: hisi: handle of_iomap and fix missing of_node_put ARM: hisi: fix error handling and missing of_node_put ARM: hisi: check of_iomap and fix missing of_node_put Nicholas Piggin (1): powerpc/powernv: opal_put_chars partial write fix Oliver Neukum (2): usb: uas: add support for more quirk flags Revert "cdc-acm: implement put_char() and flush_chars()" Parav Pandit (1): RDMA/cma: Protect cma dev list with lock Paul Burton (2): MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads MIPS: VDSO: Match data page cache colouring when D$ aliases Paul Cercueil (1): MIPS: jz4740: Bump zload address Peter Rosin (2): mfd: 88pm860x-i2c: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) input: rohm_bu21023: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Petr Oros (1): be2net: Fix memory leak in be_cmd_get_profile_config() Pingfan Liu (1): drivers/base: stop new probing during shutdown Piotr Sawicki (1): Smack: Fix handling of IPv4 traffic received by PF_INET6 sockets Rajan Vaja (1): clk: clk-fixed-factor: Clear OF_POPULATED flag in case of failure Randy Dunlap (3): mtd/maps: fix solutionengine.c printk format warnings fbdev/via: fix defined but not used warning platform/x86: toshiba_acpi: Fix defined but not used build warnings Robin Murphy (1): coresight: tpiu: Fix disabling timeouts Ronny Chevalier (1): audit: fix use-after-free in audit_add_watch Sandipan Das (2): perf powerpc: Fix callchain ip filtering when return address is in a register perf powerpc: Fix callchain ip filtering Stefan Agner (2): mmc: tegra: prevent HS200 on Tegra 3 mmc: sdhci: do not try to use 3.3V signaling if not supported Suzuki K Poulose (1): coresight: Handle errors in finding input/output ports Takashi Iwai (2): ALSA: msnd: Fix the default sample sizes ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro Thierry Reding (1): drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping Thomas Richter (1): perf test: Fix subtest number when showing results Tim Anderson (1): USB: Add quirk to support DJI CineSSD Timo Wischer (1): ALSA: pcm: Fix snd_interval_refine first/last with open min/max Trond Myklebust (1): NFSv4.1 fix infinite loop on I/O. Vitaly Kuznetsov (1): xen-netfront: fix queue name setting Wei Lu (1): drm/amdkfd: Fix error codes in kfd_get_process Wei Yongjun (1): gpio: pxa: Fix potential NULL dereference Xiao Liang (1): xen-netfront: fix warn message as irq device name has '/' Yabin Cui (1): perf/core: Force USER_DS when recording user stack data Yoshihiro Shimoda (1): usb: gadget: udc: renesas_usb3: fix maxpacket size of ep0 YueHaibing (2): xfrm: fix 'passing zero to ERR_PTR()' warning wan/fsl_ucc_hdlc: use IS_ERR_VALUE() to check return value of qe_muram_alloc Zhouyang Jia (1): rtc: bq4802: add error handling for devm_ioremap Zhu Yanjun (1): IB/rxe: Drop QP0 silently

6 years, 7 months

1
1
0 0

Linux 4.4.158

by Greg KH

I'm announcing the release of the 4.4.158 kernel. All users of the 4.4 kernel series must upgrade. The updated 4.4.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 - arch/arm/mach-exynos/suspend.c | 1 arch/arm/mach-hisi/hotplug.c | 41 +++++++++++++-------- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 - arch/mips/ath79/setup.c | 1 arch/mips/include/asm/mach-ath79/ath79.h | 1 arch/mips/jz4740/Platform | 2 - arch/mips/kernel/vdso.c | 20 ++++++++++ arch/mips/loongson64/common/cs5536/cs5536_ohci.c | 2 - arch/powerpc/platforms/powernv/opal.c | 2 - drivers/clk/imx/clk-imx6ul.c | 1 drivers/crypto/sahara.c | 4 +- drivers/dma/pl330.c | 5 +- drivers/gpio/gpiolib.h | 2 - drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 13 ++++++ drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 2 - drivers/hwtracing/coresight/coresight-tpiu.c | 7 ++- drivers/hwtracing/coresight/coresight.c | 7 ++- drivers/infiniband/core/cma.c | 12 +++--- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 + drivers/iommu/arm-smmu-v3.c | 1 drivers/media/v4l2-core/videobuf2-core.c | 5 ++ drivers/misc/hmc6352.c | 2 + drivers/misc/mei/bus-fixup.c | 2 - drivers/mtd/maps/solutionengine.c | 6 +-- drivers/mtd/mtdchar.c | 10 +++-- drivers/net/ethernet/ti/cpsw.c | 37 +++++++++++------- drivers/net/xen-netfront.c | 30 +++++++-------- drivers/parport/parport_sunbpp.c | 8 +++- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 32 ++++++++++++---- drivers/platform/x86/toshiba_acpi.c | 3 + drivers/rtc/rtc-bq4802.c | 4 ++ drivers/s390/net/qeth_core_main.c | 3 + drivers/s390/net/qeth_core_sys.c | 1 drivers/usb/class/cdc-wdm.c | 2 - drivers/usb/core/hcd-pci.c | 2 - drivers/usb/core/message.c | 11 +++++ drivers/usb/core/quirks.c | 7 +++ drivers/usb/gadget/udc/net2280.c | 16 +++++++- drivers/usb/host/u132-hcd.c | 2 - drivers/usb/misc/uss720.c | 4 +- drivers/usb/misc/yurex.c | 5 +- drivers/usb/serial/io_ti.h | 2 - drivers/usb/serial/ti_usb_3410_5052.h | 2 - drivers/usb/storage/scsiglue.c | 9 ++++ drivers/usb/storage/unusual_devs.h | 7 +++ drivers/video/fbdev/core/modedb.c | 41 +++++++++++++++------ drivers/video/fbdev/goldfishfb.c | 1 drivers/video/fbdev/omap/omapfb_main.c | 2 - drivers/video/fbdev/via/viafbdev.c | 3 + fs/binfmt_elf.c | 2 - fs/cifs/readdir.c | 11 ++++- fs/cifs/smb2pdu.c | 25 +++++++----- fs/gfs2/bmap.c | 2 - fs/pstore/ram_core.c | 17 +++++++- kernel/audit_watch.c | 12 +++++- net/mac80211/cfg.c | 2 - net/mac80211/key.c | 24 +++++++----- net/xfrm/xfrm_policy.c | 5 ++ scripts/Kbuild.include | 3 + sound/core/pcm_lib.c | 14 +++++-- sound/isa/msnd/msnd_pinnacle.c | 4 +- sound/usb/quirks-table.h | 3 + tools/hv/hv_kvp_daemon.c | 2 - tools/perf/arch/powerpc/util/skip-callchain-idx.c | 10 +++-- tools/testing/selftests/timers/raw_skew.c | 5 ++ 67 files changed, 382 insertions(+), 150 deletions(-) Aaron Knister (1): IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler Alan Stern (1): USB: net2280: Fix erroneous synchronization change Andreas Gruenbacher (1): gfs2: Special-case rindex for gfs2_grow Andy Shevchenko (1): gpiolib: Mark gpio_suffixes array with __maybe_unused Anton Vasilyev (1): video: goldfishfb: fix memory leak on driver remove Ben Hutchings (1): USB: yurex: Fix buffer over-read in yurex_write() Bin Yang (1): pstore: Fix incorrect persistent ram buffer mapping Dan Carpenter (5): fbdev: omapfb: off by one in omapfb_register_client() cifs: prevent integer overflow in nxt_dir_entry() CIFS: fix wrapping bugs in num_entries() drm/panel: type promotion bug in s6e8aa0_read_mtp_id() mei: bus: type promotion bug in mei_nfc_if_version() David Rivshin (1): drivers: net: cpsw: fix segfault in case of bad phy-handle Douglas Anderson (1): pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant Felix Fietkau (1): MIPS: ath79: fix system restart Fredrik Noring (1): fbdev: Distinguish between interlaced and progressive modes Greg Kroah-Hartman (1): Linux 4.4.158 Gustavo A. R. Silva (1): misc: hmc6352: fix potential Spectre v1 Hans Verkuil (1): media: videobuf2-core: check for q->error in vb2_core_qbuf() Jann Horn (1): mtdchar: fix overflows in adjustment of `count` Jia-Ju Bai (3): usb: host: u132-hcd: Fix a sleep-in-atomic-context bug in u132_get_frame() usb: misc: uss720: Fix two sleep-in-atomic-context bugs usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt() Johan Hovold (2): USB: serial: io_ti: fix array underflow in completion handler USB: serial: ti_usb_3410_5052: fix array underflow in completion handler John Keeping (1): dmaengine: pl330: fix irq race with terminate_all John Stultz (1): selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Juergen Gross (1): xen/netfront: fix waiting for xenbus state change Julia Lawall (1): parport: sunbpp: fix error return code Julian Wiedmann (2): s390/qeth: fix race in used-buffer accounting s390/qeth: reset layer2 attribute on layer switch K. Y. Srinivasan (1): Tools: hv: Fix a bug in the key delete code Krzysztof Kozlowski (1): ARM: exynos: Clear global variable on init error path Loic Poulain (1): arm64: dts: qcom: db410c: Fix Bluetooth LED trigger Maciej W. Rozycki (1): binfmt_elf: Respect error return from `regset->active' Manikanta Pubbisetty (1): mac80211: restrict delayed tailroom needed decrement Masahiro Yamada (1): kbuild: add .DELETE_ON_ERROR special target Mathias Nyman (2): usb: Don't die twice if PCI xhci host is not responding in resume usb: Avoid use-after-free by flushing endpoints early in usb_set_interface() Maxence Duprès (1): USB: add quirk for WORLDE Controller KS49 or Prodipe MIDI 49C USB controller Miao Zhong (1): iommu/arm-smmu-v3: sync the OVACKFLG to PRIQ consumer register Michael Müller (1): crypto: sharah - Unregister correct algorithms for SAHARA 3 Nicholas Mc Guire (4): clk: imx6ul: fix missing of_node_put() ARM: hisi: handle of_iomap and fix missing of_node_put ARM: hisi: fix error handling and missing of_node_put ARM: hisi: check of_iomap and fix missing of_node_put Nicholas Piggin (1): powerpc/powernv: opal_put_chars partial write fix Parav Pandit (1): RDMA/cma: Protect cma dev list with lock Paul Burton (2): MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads MIPS: VDSO: Match data page cache colouring when D$ aliases Paul Cercueil (1): MIPS: jz4740: Bump zload address Randy Dunlap (3): mtd/maps: fix solutionengine.c printk format warnings fbdev/via: fix defined but not used warning platform/x86: toshiba_acpi: Fix defined but not used build warnings Robin Murphy (1): coresight: tpiu: Fix disabling timeouts Ronny Chevalier (1): audit: fix use-after-free in audit_add_watch Sandipan Das (2): perf powerpc: Fix callchain ip filtering when return address is in a register perf powerpc: Fix callchain ip filtering Suzuki K Poulose (1): coresight: Handle errors in finding input/output ports Takashi Iwai (2): ALSA: msnd: Fix the default sample sizes ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro Thierry Reding (1): drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping Tim Anderson (1): USB: Add quirk to support DJI CineSSD Timo Wischer (1): ALSA: pcm: Fix snd_interval_refine first/last with open min/max Vitaly Kuznetsov (1): xen-netfront: fix queue name setting Wei Lu (1): drm/amdkfd: Fix error codes in kfd_get_process Xiao Liang (1): xen-netfront: fix warn message as irq device name has '/' YueHaibing (1): xfrm: fix 'passing zero to ERR_PTR()' warning Zhouyang Jia (1): rtc: bq4802: add error handling for devm_ioremap

6 years, 7 months

1
1
0 0

Linux 3.18.123

by Greg KH

I'm announcing the release of the 3.18.123 kernel. All users of the 3.18 kernel series must upgrade. The updated 3.18.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.18.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 - arch/arm/mach-hisi/hotplug.c | 33 +++++++++++------ arch/mips/ath79/setup.c | 1 arch/mips/include/asm/io.h | 8 ++-- arch/mips/include/asm/mach-ath79/ath79.h | 1 arch/mips/kernel/process.c | 1 arch/mips/loongson/common/cs5536/cs5536_ohci.c | 2 - arch/mips/mm/c-r4k.c | 6 ++- arch/openrisc/kernel/process.c | 2 - arch/powerpc/platforms/powernv/opal.c | 2 - arch/powerpc/platforms/pseries/ras.c | 2 - arch/powerpc/sysdev/mpic_msgr.c | 2 - arch/x86/mm/fault.c | 2 - block/cfq-iosched.c | 3 + block/partitions/aix.c | 13 ++++-- drivers/ata/libahci.c | 2 + drivers/bluetooth/Kconfig | 1 drivers/gpio/gpio-ml-ioh.c | 3 + drivers/gpu/drm/panel/panel-s6e8aa0.c | 2 - drivers/i2c/busses/i2c-xiic.c | 4 ++ drivers/infiniband/core/cma.c | 12 +++--- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 + drivers/macintosh/via-pmu.c | 9 ++-- drivers/md/dm-kcopyd.c | 2 + drivers/md/raid5.c | 6 +++ drivers/mfd/sm501.c | 1 drivers/mfd/ti_am335x_tscadc.c | 3 - drivers/mtd/maps/solutionengine.c | 6 +-- drivers/mtd/mtdchar.c | 10 +++-- drivers/net/ethernet/cisco/enic/enic_main.c | 2 - drivers/net/ethernet/marvell/mvneta.c | 1 drivers/net/wireless/ath/ath10k/mac.c | 7 +++ drivers/net/xen-netfront.c | 24 +++++------- drivers/parport/parport_sunbpp.c | 8 +++- drivers/pci/host/pci-mvebu.c | 2 - drivers/platform/x86/asus-nb-wmi.c | 1 drivers/platform/x86/toshiba_acpi.c | 3 + drivers/rtc/rtc-bq4802.c | 4 ++ drivers/s390/block/dasd_eckd.c | 7 ++- drivers/s390/net/qeth_core_main.c | 3 + drivers/s390/net/qeth_core_sys.c | 1 drivers/scsi/3w-9xxx.c | 6 ++- drivers/scsi/3w-sas.c | 3 + drivers/scsi/3w-xxxx.c | 2 + drivers/scsi/aic94xx/aic94xx_init.c | 4 +- drivers/staging/comedi/drivers/ni_mio_common.c | 3 + drivers/staging/rts5208/rtsx_scsi.c | 2 - drivers/staging/rts5208/xd.c | 2 - drivers/target/target_core_transport.c | 5 +- drivers/tty/rocket.c | 2 - drivers/uio/uio.c | 3 - drivers/usb/class/cdc-wdm.c | 2 - drivers/usb/core/hcd-pci.c | 2 - drivers/usb/core/message.c | 11 +++++ drivers/usb/core/quirks.c | 3 + drivers/usb/host/u132-hcd.c | 2 - drivers/usb/host/xhci.c | 3 + drivers/usb/misc/uss720.c | 4 +- drivers/usb/misc/yurex.c | 5 +- drivers/usb/serial/io_ti.h | 2 - drivers/usb/serial/ti_usb_3410_5052.h | 2 - drivers/usb/storage/scsiglue.c | 9 ++++ drivers/usb/storage/unusual_devs.h | 7 +++ drivers/video/fbdev/core/modedb.c | 41 ++++++++++++++++------ drivers/video/fbdev/goldfishfb.c | 1 drivers/video/fbdev/omap/omapfb_main.c | 2 - drivers/video/fbdev/via/viafbdev.c | 3 + fs/binfmt_elf.c | 2 - fs/btrfs/dev-replace.c | 6 +++ fs/btrfs/extent-tree.c | 2 - fs/btrfs/relocation.c | 23 ++++++------ fs/cifs/cifs_debug.c | 8 ++++ fs/cifs/readdir.c | 11 ++++- fs/cifs/smb2misc.c | 7 +++ fs/cifs/smb2pdu.c | 27 ++++++++------ fs/f2fs/super.c | 21 ++++++++++- fs/fat/cache.c | 19 ++++++---- fs/fat/fat.h | 5 ++ fs/fat/fatent.c | 6 +-- fs/gfs2/bmap.c | 2 - fs/hfs/brec.c | 7 ++- fs/hfsplus/super.c | 4 +- fs/pstore/ram_core.c | 17 +++++++-- fs/reiserfs/reiserfs.h | 2 - include/linux/mm_types.h | 2 - include/linux/sched.h | 2 - include/linux/vmacache.h | 5 -- kernel/audit_watch.c | 12 +++++- kernel/fork.c | 19 +++++++--- lib/debugobjects.c | 7 ++- mm/debug.c | 4 +- mm/fadvise.c | 8 +++- mm/huge_memory.c | 2 - mm/vmacache.c | 36 ------------------- net/9p/trans_virtio.c | 3 + net/bluetooth/hidp/core.c | 2 - net/dcb/dcbnl.c | 11 +++-- net/irda/af_irda.c | 13 ++++++ net/mac80211/cfg.c | 2 - net/mac80211/key.c | 24 ++++++++---- net/netfilter/ipvs/ip_vs_core.c | 15 +++++--- net/netfilter/x_tables.c | 4 +- net/xfrm/xfrm_policy.c | 5 ++ scripts/depmod.sh | 4 +- scripts/mod/modpost.c | 8 ++-- sound/core/pcm_lib.c | 14 +++++-- sound/isa/msnd/msnd_pinnacle.c | 4 +- sound/soc/codecs/wm8994.c | 1 sound/usb/quirks-table.h | 3 + tools/hv/hv_kvp_daemon.c | 2 - tools/perf/arch/powerpc/util/skip-callchain-idx.c | 10 +++-- tools/testing/selftests/powerpc/harness.c | 18 ++++++--- 112 files changed, 489 insertions(+), 257 deletions(-) Aaron Knister (1): IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler Aleh Filipovich (1): platform/x86: asus-nb-wmi: Add keymap entry for lid flip action on UX360 Andreas Gruenbacher (1): gfs2: Special-case rindex for gfs2_grow Andrey Ryabinin (1): mm/fadvise.c: fix signed overflow UBSAN complaint Anton Vasilyev (4): tty: rocket: Fix possible buffer overwrite on register_PCI scsi: 3ware: fix return 0 on the error path of probe gpio: ml-ioh: Fix buffer underwrite on probe error path video: goldfishfb: fix memory leak on driver remove Arnd Bergmann (1): reiserfs: change j_timestamp type to time64_t Ben Hutchings (1): USB: yurex: Fix buffer over-read in yurex_write() Bin Yang (1): pstore: Fix incorrect persistent ram buffer mapping BingJing Chang (1): md/raid5: fix data corruption of replacements after originals dropped Breno Leitao (1): selftests/powerpc: Kill child processes on SIGINT Chao Yu (1): f2fs: fix to do sanity check with {sit,nat}_ver_bitmap_bytesize Chas Williams (1): Fixes: Commit 86af955d02bb ("mm: numa: avoid waiting on freed migrated pages") Dan Carpenter (7): powerpc: Fix size calculation using resource_size() scsi: aic94xx: fix an error code in aic94xx_init() uio: potential double frees if __uio_register_device() fails fbdev: omapfb: off by one in omapfb_register_client() cifs: prevent integer overflow in nxt_dir_entry() CIFS: fix wrapping bugs in num_entries() drm/panel: type promotion bug in s6e8aa0_read_mtp_id() Daniel Micay (1): staging/rts5208: Fix read overflow in memcpy Eric Dumazet (1): netfilter: x_tables: avoid stack-out-of-bounds read in xt_copy_counters_from_user Ernesto A. Fernández (1): hfs: prevent crash on exit from failed search Felix Fietkau (1): MIPS: ath79: fix system restart Finn Thain (1): macintosh/via-pmu: Add missing mmio accessors Fredrik Noring (1): fbdev: Distinguish between interlaced and progressive modes Govindarajulu Varadarajan (1): enic: do not call enic_change_mtu in enic_probe Greg Kroah-Hartman (1): Linux 3.18.123 Guenter Roeck (1): mfd: sm501: Set coherent_dma_mask when creating subdevices Gustavo A. R. Silva (1): ASoC: wm8994: Fix missing break in switch Ian Abbott (1): staging: comedi: ni_mio_common: fix subdevice flags for PFI subdevice Jann Horn (2): fork: don't copy inconsistent signal handler state to child mtdchar: fix overflows in adjustment of `count` Jean-Philippe Brucker (1): net/9p: fix error path of p9_virtio_probe Jia-Ju Bai (4): staging: rt5208: Fix a sleep-in-atomic bug in xd_copy_page usb: host: u132-hcd: Fix a sleep-in-atomic-context bug in u132_get_frame() usb: misc: uss720: Fix two sleep-in-atomic-context bugs usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt() Joel Fernandes (Google) (1): debugobjects: Make stack check warning more informative Joerg Roedel (1): x86/mm: Remove in_nmi() warning from vmalloc_fault() Johan Hedberg (1): Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV Johan Hovold (2): USB: serial: io_ti: fix array underflow in completion handler USB: serial: ti_usb_3410_5052: fix array underflow in completion handler John Pittman (1): dm kcopyd: avoid softlockup in run_complete_job Juergen Gross (1): xen/netfront: fix waiting for xenbus state change Julia Lawall (1): parport: sunbpp: fix error return code Julian Wiedmann (2): s390/qeth: fix race in used-buffer accounting s390/qeth: reset layer2 attribute on layer switch K. Y. Srinivasan (1): Tools: hv: Fix a bug in the key delete code Linus Torvalds (1): mm: get rid of vmacache_flush_all() entirely Maciej W. Rozycki (1): binfmt_elf: Respect error return from `regset->active' Mahesh Salgaonkar (1): powerpc/pseries: Avoid using the size greater than RTAS_ERROR_LOG_MAX. Manikanta Pubbisetty (1): mac80211: restrict delayed tailroom needed decrement Marcel Holtmann (1): Bluetooth: hidp: Fix handling of strncpy for hid->name information Mathias Nyman (3): xhci: Fix use-after-free in xhci_free_virt_device usb: Don't die twice if PCI xhci host is not responding in resume usb: Avoid use-after-free by flushing endpoints early in usb_set_interface() Mauricio Faria de Oliveira (2): partitions/aix: append null character to print data from disk partitions/aix: fix usage of uninitialized lv_info and lvname structures Mike Christie (1): scsi: target: fix __transport_register_session locking Misono Tomohiro (1): btrfs: replace: Reset on-disk dev stats value after replace Nicholas Mc Guire (2): ARM: hisi: handle of_iomap and fix missing of_node_put ARM: hisi: check of_iomap and fix missing of_node_put Nicholas Piggin (1): powerpc/powernv: opal_put_chars partial write fix OGAWA Hirofumi (1): fat: validate ->i_start before using Parav Pandit (1): RDMA/cma: Protect cma dev list with lock Paul Burton (3): MIPS: Fix ISA virt/bus conversion for non-zero PHYS_OFFSET MIPS: WARN_ON invalid DMA cache maintenance, not BUG_ON MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads Petr Machata (1): net: dcb: For wild-card lookups, use priority -1, not 0 Qu Wenruo (2): btrfs: relocation: Only remove reloc rb_trees if reloc control has been initialized btrfs: Don't remove block group that still has pinned down bytes Randy Dunlap (5): scripts: modpost: check memory allocation results kbuild: make missing $DEPMOD a Warning instead of an Error mtd/maps: fix solutionengine.c printk format warnings fbdev/via: fix defined but not used warning platform/x86: toshiba_acpi: Fix defined but not used build warnings Ritesh Harjani (1): cfq: Give a chance for arming slice idle timer in case of group_idle Ronnie Sahlberg (1): cifs: check if SMB2 PDU size has been padded and suppress the warning Ronny Chevalier (1): audit: fix use-after-free in audit_add_watch Sandipan Das (2): perf powerpc: Fix callchain ip filtering when return address is in a register perf powerpc: Fix callchain ip filtering Shubhrajyoti Datta (1): i2c: xiic: Make the start and the byte count write atomic Srinivas Pandruvada (1): ata: libahci: Correct setting of DEVSLP register Stefan Haberland (1): s390/dasd: fix hanging offline processing due to canceled worker Steve French (2): smb3: fix reset of bytes read and written stats SMB3: Number of requests sent should be displayed for SMB3 not just CIFS Sven Eckelmann (1): ath10k: prevent active scans on potential unusable channels Takashi Iwai (2): ALSA: msnd: Fix the default sample sizes ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro Tan Hu (1): ipvs: fix race between ip_vs_conn_new() and ip_vs_del_dest() Tetsuo Handa (1): hfsplus: don't return 0 when fill_super() failed Thomas Petazzoni (1): PCI: mvebu: Fix I/O space end address calculation Tim Anderson (1): USB: Add quirk to support DJI CineSSD Timo Wischer (1): ALSA: pcm: Fix snd_interval_refine first/last with open min/max Tyler Hicks (2): irda: Fix memory leak caused by repeated binds of irda socket irda: Only insert new objects into the global database via setsockopt Vegard Nossum (2): kthread: Fix use-after-free if kthread fork fails kthread: fix boot hang (regression) on MIPS/OpenRISC Yelena Krivosheev (1): net: mvneta: fix mtu change on port without link YueHaibing (1): xfrm: fix 'passing zero to ERR_PTR()' warning Zhouyang Jia (1): rtc: bq4802: add error handling for devm_ioremap Zumeng Chen (1): mfd: ti_am335x_tscadc: Fix struct clk memory leak

6 years, 7 months

1
1
0 0

[PATCH] usb: usbfs: fix crash in check_ctrlrecip()->usb_find_alt_setting()

by Vladis Dronov

ps->dev->actconfig can be NULL and cause NULL-deref in usb_find_alt_setting() before c9a4cb204e9e. fix this anyway by checking that ps->dev->actconfig is not NULL, so usb_find_alt_setting() is not called with a known-bad argument. Signed-off-by: Vladis Dronov <vdronov(a)redhat.com> Reported-by: syzbot+19c3aaef85a89d451eac(a)syzkaller.appspotmail.com --- drivers/usb/core/devio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index 6ce77b33da61..26047620b003 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c @@ -824,7 +824,7 @@ static int check_ctrlrecip(struct usb_dev_state *ps, unsigned int requesttype, * class specification, which we always want to allow as it is used * to query things like ink level, etc. */ - if (requesttype == 0xa1 && request == 0) { + if (requesttype == 0xa1 && request == 0 && ps->dev->actconfig) { alt_setting = usb_find_alt_setting(ps->dev->actconfig, index >> 8, index & 0xff); if (alt_setting -- 2.14.4

6 years, 7 months

3
8
0 0

+ mm-thp-relax-__gfp_thisnode-for-madv_hugepage-mappings.patch added to -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: mm: thp: relax __GFP_THISNODE for MADV_HUGEPAGE mappings has been added to the -mm tree. Its filename is mm-thp-relax-__gfp_thisnode-for-madv_hugepage-mappings.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-thp-relax-__gfp_thisnode-for-ma… and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-thp-relax-__gfp_thisnode-for-ma… Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrea Arcangeli <aarcange(a)redhat.com> Subject: mm: thp: relax __GFP_THISNODE for MADV_HUGEPAGE mappings THP allocation might be really disruptive when allocated on NUMA system with the local node full or hard to reclaim. Stefan has posted an allocation stall report on 4.12 based SLES kernel which suggests the same issue: [245513.362669] kvm: page allocation stalls for 194572ms, order:9, mode:0x4740ca(__GFP_HIGHMEM|__GFP_IO|__GFP_FS|__GFP_COMP|__GFP_NOMEMALLOC|__GFP_HARDWALL|__GFP_THISNODE|__GFP_MOVABLE|__GFP_DIRECT_RECLAIM), nodemask=(null) [245513.363983] kvm cpuset=/ mems_allowed=0-1 [245513.364604] CPU: 10 PID: 84752 Comm: kvm Tainted: G W 4.12.0+98-ph <a href="/view.php?id=1" title="[geschlossen] Integration Ramdisk" class="resolved">0000001</a> SLE15 (unreleased) [245513.365258] Hardware name: Supermicro SYS-1029P-WTRT/X11DDW-NT, BIOS 2.0 12/05/2017 [245513.365905] Call Trace: [245513.366535] dump_stack+0x5c/0x84 [245513.367148] warn_alloc+0xe0/0x180 [245513.367769] __alloc_pages_slowpath+0x820/0xc90 [245513.368406] ? __slab_free+0xa9/0x2f0 [245513.369048] ? __slab_free+0xa9/0x2f0 [245513.369671] __alloc_pages_nodemask+0x1cc/0x210 [245513.370300] alloc_pages_vma+0x1e5/0x280 [245513.370921] do_huge_pmd_wp_page+0x83f/0xf00 [245513.371554] ? set_huge_zero_page.isra.52.part.53+0x9b/0xb0 [245513.372184] ? do_huge_pmd_anonymous_page+0x631/0x6d0 [245513.372812] __handle_mm_fault+0x93d/0x1060 [245513.373439] handle_mm_fault+0xc6/0x1b0 [245513.374042] __do_page_fault+0x230/0x430 [245513.374679] ? get_vtime_delta+0x13/0xb0 [245513.375411] do_page_fault+0x2a/0x70 [245513.376145] ? page_fault+0x65/0x80 [245513.376882] page_fault+0x7b/0x80 [...] [245513.382056] Mem-Info: [245513.382634] active_anon:126315487 inactive_anon:1612476 isolated_anon:5 active_file:60183 inactive_file:245285 isolated_file:0 unevictable:15657 dirty:286 writeback:1 unstable:0 slab_reclaimable:75543 slab_unreclaimable:2509111 mapped:81814 shmem:31764 pagetables:370616 bounce:0 free:32294031 free_pcp:6233 free_cma:0 [245513.386615] Node 0 active_anon:254680388kB inactive_anon:1112760kB active_file:240648kB inactive_file:981168kB unevictable:13368kB isolated(anon):0kB isolated(file):0kB mapped:280240kB dirty:1144kB writeback:0kB shmem:95832kB shmem_thp: 0kB shmem_pmdmapped: 0kB anon_thp: 81225728kB writeback_tmp:0kB unstable:0kB all_unreclaimable? no [245513.388650] Node 1 active_anon:250583072kB inactive_anon:5337144kB active_file:84kB inactive_file:0kB unevictable:49260kB isolated(anon):20kB isolated(file):0kB mapped:47016kB dirty:0kB writeback:4kB shmem:31224kB shmem_thp: 0kB shmem_pmdmapped: 0kB anon_thp: 31897600kB writeback_tmp:0kB unstable:0kB all_unreclaimable? no The defrag mode is "madvise" and from the above report it is clear that the THP has been allocated for MADV_HUGEPAGA vma. Andrea has identified that the main source of the problem is __GFP_THISNODE usage: : The problem is that direct compaction combined with the NUMA : __GFP_THISNODE logic in mempolicy.c is telling reclaim to swap very : hard the local node, instead of failing the allocation if there's no : THP available in the local node. : : Such logic was ok until __GFP_THISNODE was added to the THP allocation : path even with MPOL_DEFAULT. : : The idea behind the __GFP_THISNODE addition, is that it is better to : provide local memory in PAGE_SIZE units than to use remote NUMA THP : backed memory. That largely depends on the remote latency though, on : threadrippers for example the overhead is relatively low in my : experience. : : The combination of __GFP_THISNODE and __GFP_DIRECT_RECLAIM results in : extremely slow qemu startup with vfio, if the VM is larger than the : size of one host NUMA node. This is because it will try very hard to : unsuccessfully swapout get_user_pages pinned pages as result of the : __GFP_THISNODE being set, instead of falling back to PAGE_SIZE : allocations and instead of trying to allocate THP on other nodes (it : would be even worse without vfio type1 GUP pins of course, except it'd : be swapping heavily instead). Fix this by removing __GFP_THISNODE for THP requests which are requesting the direct reclaim. This effectivelly reverts 5265047ac301 on the grounds that the zone/node reclaim was known to be disruptive due to premature reclaim when there was memory free. While it made sense at the time for HPC workloads without NUMA awareness on rare machines, it was ultimately harmful in the majority of cases. The existing behaviour is similiar, if not as widespare as it applies to a corner case but crucially, it cannot be tuned around like zone_reclaim_mode can. The default behaviour should always be to cause the least harm for the common case. If there are specialised use cases out there that want zone_reclaim_mode in specific cases, then it can be built on top. Longterm we should consider a memory policy which allows for the node reclaim like behavior for the specific memory ranges which would allow a [1] http://lkml.kernel.org/r/20180820032204.9591-1-aarcange@redhat.com Mel said: : Both patches look correct to me but I'm responding to this one because : it's the fix. The change makes sense and moves further away from the : severe stalling behaviour we used to see with both THP and zone reclaim : mode. : : I put together a basic experiment with usemem configured to reference a : buffer multiple times that is 80% the size of main memory on a 2-socket : box with symmetric node sizes and defrag set to "always". The defrag : setting is not the default but it would be functionally similar to : accessing a buffer with madvise(MADV_HUGEPAGE). Usemem is configured to : reference the buffer multiple times and while it's not an interesting : workload, it would be expected to complete reasonably quickly as it fits : within memory. The results were; : : usemem : vanilla noreclaim-v1 : Amean Elapsd-1 42.78 ( 0.00%) 26.87 ( 37.18%) : Amean Elapsd-3 27.55 ( 0.00%) 7.44 ( 73.00%) : Amean Elapsd-4 5.72 ( 0.00%) 5.69 ( 0.45%) : : This shows the elapsed time in seconds for 1 thread, 3 threads and 4 : threads referencing buffers 80% the size of memory. With the patches : applied, it's 37.18% faster for the single thread and 73% faster with two : threads. Note that 4 threads showing little difference does not indicate : the problem is related to thread counts. It's simply the case that 4 : threads gets spread so their workload mostly fits in one node. : : The overall view from /proc/vmstats is more startling : : 4.19.0-rc1 4.19.0-rc1 : vanillanoreclaim-v1r1 : Minor Faults 35593425 708164 : Major Faults 484088 36 : Swap Ins 3772837 0 : Swap Outs 3932295 0 : : Massive amounts of swap in/out without the patch : : Direct pages scanned 6013214 0 : Kswapd pages scanned 0 0 : Kswapd pages reclaimed 0 0 : Direct pages reclaimed 4033009 0 : : Lots of reclaim activity without the patch : : Kswapd efficiency 100% 100% : Kswapd velocity 0.000 0.000 : Direct efficiency 67% 100% : Direct velocity 11191.956 0.000 : : Mostly from direct reclaim context as you'd expect without the patch. : : Page writes by reclaim 3932314.000 0.000 : Page writes file 19 0 : Page writes anon 3932295 0 : Page reclaim immediate 42336 0 : : Writes from reclaim context is never good but the patch eliminates it. : : We should never have default behaviour to thrash the system for such a : basic workload. If zone reclaim mode behaviour is ever desired but on a : single task instead of a global basis then the sensible option is to build : a mempolicy that enforces that behaviour. [mhocko(a)suse.com: rewrote the changelog based on the one from Andrea] Link: http://lkml.kernel.org/r/20180925120326.24392-2-mhocko@kernel.org Fixes: 5265047ac301 ("mm, thp: really limit transparent hugepage allocation to local node") Signed-off-by: Andrea Arcangeli <aarcange(a)redhat.com> Signed-off-by: Michal Hocko <mhocko(a)suse.com> Reported-by: Stefan Priebe <s.priebe(a)profihost.ag> Debugged-by: Andrea Arcangeli <aarcange(a)redhat.com> Reported-by: Alex Williamson <alex.williamson(a)redhat.com> Reviewed-by: Mel Gorman <mgorman(a)techsingularity.net> Tested-by: Mel Gorman <mgorman(a)techsingularity.net> Cc: Zi Yan <zi.yan(a)cs.rutgers.edu> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: David Rientjes <rientjes(a)google.com> Cc: Stefan Priebe - Profihost AG <s.priebe(a)profihost.ag> Cc: "Kirill A. Shutemov" <kirill(a)shutemov.name> Cc: <stable(a)vger.kernel.org> [4.1+] Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/mempolicy.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) --- a/mm/mempolicy.c~mm-thp-relax-__gfp_thisnode-for-madv_hugepage-mappings +++ a/mm/mempolicy.c @@ -2046,8 +2046,36 @@ alloc_pages_vma(gfp_t gfp, int order, st nmask = policy_nodemask(gfp, pol); if (!nmask || node_isset(hpage_node, *nmask)) { mpol_cond_put(pol); - page = __alloc_pages_node(hpage_node, - gfp | __GFP_THISNODE, order); + /* + * We cannot invoke reclaim if __GFP_THISNODE + * is set. Invoking reclaim with + * __GFP_THISNODE set, would cause THP + * allocations to trigger heavy swapping + * despite there may be tons of free memory + * (including potentially plenty of THP + * already available in the buddy) on all the + * other NUMA nodes. + * + * At most we could invoke compaction when + * __GFP_THISNODE is set (but we would need to + * refrain from invoking reclaim even if + * compaction returned COMPACT_SKIPPED because + * there wasn't not enough memory to succeed + * compaction). For now just avoid + * __GFP_THISNODE instead of limiting the + * allocation path to a strict and single + * compaction invocation. + * + * Supposedly if direct reclaim was enabled by + * the caller, the app prefers THP regardless + * of the node it comes from so this would be + * more desiderable behavior than only + * providing THP originated from the local + * node in such case. + */ + if (!(gfp & __GFP_DIRECT_RECLAIM)) + gfp |= __GFP_THISNODE; + page = __alloc_pages_node(hpage_node, gfp, order); goto out; } } _ Patches currently in -mm which might be from aarcange(a)redhat.com are mm-thp-relax-__gfp_thisnode-for-madv_hugepage-mappings.patch userfaultfd-allow-get_mempolicympol_f_nodempol_f_addr-to-trigger-userfaults.patch

6 years, 7 months

1
0
0 0

[PATCH 4.9 000/111] 4.9.129-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.129 release. There are 111 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 Sep 26 11:30:16 UTC 2018. 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.9.129-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.129-rc1 Paul Burton <paul.burton(a)imgtec.com> MIPS: VDSO: Drop gic_get_usm_range() usage Benjamin Poirier <bpoirier(a)suse.com> e1000e: Fix link check race condition Benjamin Poirier <bpoirier(a)suse.com> Revert "e1000e: Separate signaling for link check/link up" Benjamin Poirier <bpoirier(a)suse.com> e1000e: Avoid missed interrupts following ICR read Benjamin Poirier <bpoirier(a)suse.com> e1000e: Fix queue interrupt re-raising in Other interrupt Benjamin Poirier <bpoirier(a)suse.com> Partial revert "e1000e: Avoid receiver overrun interrupt bursts" Benjamin Poirier <bpoirier(a)suse.com> e1000e: Remove Other from EIAC Paul Burton <paul.burton(a)mips.com> MIPS: VDSO: Match data page cache colouring when D$ aliases Dan Carpenter <dan.carpenter(a)oracle.com> mei: bus: type promotion bug in mei_nfc_if_version() Douglas Anderson <dianders(a)chromium.org> pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> gpiolib: Respect error code of ->get_direction() Bart Van Assche <bart.vanassche(a)wdc.com> IB/nes: Fix a compiler warning Dan Carpenter <dan.carpenter(a)oracle.com> drm/panel: type promotion bug in s6e8aa0_read_mtp_id() John Stultz <john.stultz(a)linaro.org> selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Timo Wischer <twischer(a)de.adit-jv.com> ALSA: pcm: Fix snd_interval_refine first/last with open min/max Zhouyang Jia <jiazhouyang09(a)gmail.com> rtc: bq4802: add error handling for devm_ioremap Wei Lu <wei.lu2(a)amd.com> drm/amdkfd: Fix error codes in kfd_get_process Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> rcu: Fix grace-period hangs due to race with CPU offline Peter Rosin <peda(a)axentia.se> input: rohm_bu21023: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Peter Rosin <peda(a)axentia.se> mfd: 88pm860x-i2c: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> gpiolib: Mark gpio_suffixes array with __maybe_unused Wei Yongjun <weiyongjun1(a)huawei.com> gpio: pxa: Fix potential NULL dereference Robin Murphy <robin.murphy(a)arm.com> coresight: tpiu: Fix disabling timeouts Suzuki K Poulose <suzuki.poulose(a)arm.com> coresight: Handle errors in finding input/output ports Julia Lawall <Julia.Lawall(a)lip6.fr> parport: sunbpp: fix error return code Thierry Reding <treding(a)nvidia.com> drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping Stefan Agner <stefan(a)agner.ch> mmc: sdhci: do not try to use 3.3V signaling if not supported Stefan Agner <stefan(a)agner.ch> mmc: tegra: prevent HS200 on Tegra 3 Enrico Scholz <enrico.scholz(a)sigma-chemnitz.de> gpu: ipu-v3: csi: pass back mbus_code_to_bus_cfg error codes Nicholas Mc Guire <hofrat(a)osadl.org> ARM: hisi: check of_iomap and fix missing of_node_put Nicholas Mc Guire <hofrat(a)osadl.org> ARM: hisi: fix error handling and missing of_node_put Nicholas Mc Guire <hofrat(a)osadl.org> ARM: hisi: handle of_iomap and fix missing of_node_put Ard Biesheuvel <ard.biesheuvel(a)linaro.org> efi/esrt: Only call efi_mem_reserve() for boot services memory Mike Christie <mchristi(a)redhat.com> configfs: fix registered group removal Paul Burton <paul.burton(a)mips.com> MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads Matthew Garrett <mjg59(a)google.com> evm: Don't deadlock if a crypto algorithm is unavailable Jann Horn <jannh(a)google.com> mtdchar: fix overflows in adjustment of `count` Ronny Chevalier <ronny.chevalier(a)hp.com> audit: fix use-after-free in audit_add_watch Maciej W. Rozycki <macro(a)mips.com> binfmt_elf: Respect error return from `regset->active' Trond Myklebust <trondmy(a)gmail.com> NFSv4.1 fix infinite loop on I/O. Yabin Cui <yabinc(a)google.com> perf/core: Force USER_DS when recording user stack data Dan Carpenter <dan.carpenter(a)oracle.com> CIFS: fix wrapping bugs in num_entries() Dan Carpenter <dan.carpenter(a)oracle.com> cifs: prevent integer overflow in nxt_dir_entry() Oliver Neukum <oneukum(a)suse.com> Revert "cdc-acm: implement put_char() and flush_chars()" Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt() Ben Hutchings <ben.hutchings(a)codethink.co.uk> USB: yurex: Fix buffer over-read in yurex_write() Johan Hovold <johan(a)kernel.org> USB: serial: ti_usb_3410_5052: fix array underflow in completion handler Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: misc: uss720: Fix two sleep-in-atomic-context bugs Johan Hovold <johan(a)kernel.org> USB: serial: io_ti: fix array underflow in completion handler Alan Stern <stern(a)rowland.harvard.edu> USB: net2280: Fix erroneous synchronization change Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> usb: gadget: udc: renesas_usb3: fix maxpacket size of ep0 Maxence Duprès <xpros64(a)hotmail.fr> USB: add quirk for WORLDE Controller KS49 or Prodipe MIDI 49C USB controller Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: host: u132-hcd: Fix a sleep-in-atomic-context bug in u132_get_frame() Mathias Nyman <mathias.nyman(a)linux.intel.com> usb: Avoid use-after-free by flushing endpoints early in usb_set_interface() Oliver Neukum <oneukum(a)suse.com> usb: uas: add support for more quirk flags Tim Anderson <tsa(a)biglakesoftware.com> USB: Add quirk to support DJI CineSSD Alexander Usyskin <alexander.usyskin(a)intel.com> mei: ignore not found client in the enumeration Mathias Nyman <mathias.nyman(a)linux.intel.com> usb: Don't die twice if PCI xhci host is not responding in resume Gustavo A. R. Silva <gustavo(a)embeddedor.com> misc: hmc6352: fix potential Spectre v1 K. Y. Srinivasan <kys(a)microsoft.com> Tools: hv: Fix a bug in the key delete code Andreas Kemnade <andreas(a)kemnade.info> mmc: omap_hsmmc: fix wakeirq handling on removal Aaron Knister <aaron.s.knister(a)nasa.gov> IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler Juergen Gross <jgross(a)suse.com> xen/netfront: fix waiting for xenbus state change Bin Yang <bin.yang(a)intel.com> pstore: Fix incorrect persistent ram buffer mapping Parav Pandit <parav(a)mellanox.com> RDMA/cma: Protect cma dev list with lock Xiao Liang <xiliang(a)redhat.com> xen-netfront: fix warn message as irq device name has '/' Michael Müller <michael(a)fds-team.de> crypto: sharah - Unregister correct algorithms for SAHARA 3 Hanna Hawa <hannah(a)marvell.com> dmaengine: mv_xor_v2: kill the tasklets upon exit Pingfan Liu <kernelfans(a)gmail.com> drivers/base: stop new probing during shutdown Christoffer Dall <christoffer.dall(a)arm.com> KVM: arm/arm64: Fix vgic init race Randy Dunlap <rdunlap(a)infradead.org> platform/x86: toshiba_acpi: Fix defined but not used build warnings Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: reset layer2 attribute on layer switch Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: fix race in used-buffer accounting Bhushan Shah <bshah(a)kde.org> ARM: dts: qcom: msm8974-hammerhead: increase load on l20 for sdhci Loic Poulain <loic.poulain(a)linaro.org> arm64: dts: qcom: db410c: Fix Bluetooth LED trigger Vitaly Kuznetsov <vkuznets(a)redhat.com> xen-netfront: fix queue name setting Jakub Kicinski <jakub.kicinski(a)netronome.com> nfp: avoid buffer leak when FW communication fails Ard Biesheuvel <ard.biesheuvel(a)linaro.org> efi/arm: preserve early mapping of UEFI memory map longer for BGRT YueHaibing <yuehaibing(a)huawei.com> wan/fsl_ucc_hdlc: use IS_ERR_VALUE() to check return value of qe_muram_alloc Piotr Sawicki <p.sawicki2(a)partner.samsung.com> Smack: Fix handling of IPv4 traffic received by PF_INET6 sockets Manikanta Pubbisetty <mpubbise(a)codeaurora.org> mac80211: restrict delayed tailroom needed decrement Paul Cercueil <paul(a)crapouillou.net> MIPS: jz4740: Bump zload address Nicholas Piggin <npiggin(a)gmail.com> powerpc/powernv: opal_put_chars partial write fix Sandipan Das <sandipan(a)linux.ibm.com> perf powerpc: Fix callchain ip filtering Krzysztof Kozlowski <krzk(a)kernel.org> ARM: exynos: Clear global variable on init error path Fredrik Noring <noring(a)nocrew.org> fbdev: Distinguish between interlaced and progressive modes Daniel Mack <daniel(a)zonque.org> video: fbdev: pxafb: clear allocated memory for video modes Sandipan Das <sandipan(a)linux.ibm.com> perf powerpc: Fix callchain ip filtering when return address is in a register Randy Dunlap <rdunlap(a)infradead.org> fbdev/via: fix defined but not used warning Anton Vasilyev <vasilyev(a)ispras.ru> video: goldfishfb: fix memory leak on driver remove Dan Carpenter <dan.carpenter(a)oracle.com> fbdev: omapfb: off by one in omapfb_register_client() Bob Peterson <rpeterso(a)redhat.com> gfs2: Don't reject a supposedly full bitmap if we have blocks reserved Thomas Richter <tmricht(a)linux.ibm.com> perf test: Fix subtest number when showing results Randy Dunlap <rdunlap(a)infradead.org> mtd/maps: fix solutionengine.c printk format warnings Zhu Yanjun <yanjun.zhu(a)oracle.com> IB/rxe: Drop QP0 silently Hans Verkuil <hverkuil(a)xs4all.nl> media: videobuf2-core: check for q->error in vb2_core_qbuf() Felix Fietkau <nbd(a)nbd.name> MIPS: ath79: fix system restart John Keeping <john(a)metanate.com> dmaengine: pl330: fix irq race with terminate_all Krzysztof Ha?asa <khalasa(a)piap.pl> media: tw686x: Fix oops on buffer alloc failure Masahiro Yamada <yamada.masahiro(a)socionext.com> kbuild: add .DELETE_ON_ERROR special target Rajan Vaja <rajan.vaja(a)xilinx.com> clk: clk-fixed-factor: Clear OF_POPULATED flag in case of failure Nicholas Mc Guire <hofrat(a)osadl.org> clk: imx6ul: fix missing of_node_put() Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Special-case rindex for gfs2_grow YueHaibing <yuehaibing(a)huawei.com> xfrm: fix 'passing zero to ERR_PTR()' warning Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro Takashi Iwai <tiwai(a)suse.de> ALSA: msnd: Fix the default sample sizes Miao Zhong <zhongmiao(a)hisilicon.com> iommu/arm-smmu-v3: sync the OVACKFLG to PRIQ consumer register Jack Morgenstein <jackm(a)dev.mellanox.co.il> net/mlx5: Fix debugfs cleanup in the device init/remove flow Jack Morgenstein <jackm(a)dev.mellanox.co.il> net/mlx5: Fix use-after-free in self-healing flow Cong Wang <xiyou.wangcong(a)gmail.com> rds: fix two RCU related problems Petr Oros <poros(a)redhat.com> be2net: Fix memory leak in be_cmd_get_profile_config() ------------- Diffstat: Makefile | 4 +- .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 2 + arch/arm/mach-exynos/suspend.c | 1 + arch/arm/mach-hisi/hotplug.c | 41 +++++++----- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 +- arch/mips/ath79/setup.c | 1 + arch/mips/include/asm/mach-ath79/ath79.h | 1 + arch/mips/jz4740/Platform | 2 +- arch/mips/kernel/vdso.c | 35 ++++++++--- arch/mips/loongson64/common/cs5536/cs5536_ohci.c | 2 +- arch/powerpc/platforms/powernv/opal.c | 2 +- crypto/api.c | 2 +- drivers/base/core.c | 3 + drivers/clk/clk-fixed-factor.c | 9 ++- drivers/clk/imx/clk-imx6ul.c | 1 + drivers/crypto/sahara.c | 4 +- drivers/dma/mv_xor_v2.c | 2 + drivers/dma/pl330.c | 5 +- drivers/firmware/efi/arm-init.c | 1 - drivers/firmware/efi/arm-runtime.c | 4 +- drivers/firmware/efi/esrt.c | 3 +- drivers/gpio/gpio-pxa.c | 2 + drivers/gpio/gpiolib.c | 6 ++ drivers/gpio/gpiolib.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 13 ++++ drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 2 +- drivers/gpu/ipu-v3/ipu-csi.c | 20 ++++-- drivers/hwtracing/coresight/coresight-tpiu.c | 7 ++- drivers/hwtracing/coresight/coresight.c | 7 ++- drivers/infiniband/core/cma.c | 12 ++-- drivers/infiniband/hw/nes/nes.h | 2 +- drivers/infiniband/sw/rxe/rxe_recv.c | 9 ++- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 + drivers/input/touchscreen/rohm_bu21023.c | 4 +- drivers/iommu/arm-smmu-v3.c | 1 + drivers/media/pci/tw686x/tw686x-video.c | 11 +++- drivers/media/v4l2-core/videobuf2-core.c | 5 ++ drivers/mfd/88pm860x-i2c.c | 8 +-- drivers/misc/hmc6352.c | 2 + drivers/misc/mei/bus-fixup.c | 2 +- drivers/misc/mei/hbm.c | 9 ++- drivers/mmc/host/omap_hsmmc.c | 1 + drivers/mmc/host/sdhci-tegra.c | 3 +- drivers/mmc/host/sdhci.c | 9 ++- drivers/mtd/maps/solutionengine.c | 6 +- drivers/mtd/mtdchar.c | 10 ++- drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +- drivers/net/ethernet/intel/e1000e/defines.h | 21 ++++++- drivers/net/ethernet/intel/e1000e/ich8lan.c | 44 +++++++------ drivers/net/ethernet/intel/e1000e/mac.c | 27 ++++---- drivers/net/ethernet/intel/e1000e/netdev.c | 33 ++++------ drivers/net/ethernet/mellanox/mlx5/core/health.c | 10 ++- drivers/net/ethernet/mellanox/mlx5/core/main.c | 10 +-- .../net/ethernet/netronome/nfp/nfp_net_common.c | 13 +++- drivers/net/wan/fsl_ucc_hdlc.c | 6 +- drivers/net/xen-netfront.c | 30 +++++---- drivers/parport/parport_sunbpp.c | 8 ++- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 32 +++++++--- drivers/platform/x86/toshiba_acpi.c | 3 +- drivers/rtc/rtc-bq4802.c | 4 ++ drivers/s390/net/qeth_core_main.c | 3 +- drivers/s390/net/qeth_core_sys.c | 1 + drivers/usb/class/cdc-acm.c | 73 ---------------------- drivers/usb/class/cdc-acm.h | 1 - drivers/usb/class/cdc-wdm.c | 2 +- drivers/usb/core/hcd-pci.c | 2 - drivers/usb/core/message.c | 11 ++++ drivers/usb/core/quirks.c | 7 +++ drivers/usb/gadget/udc/net2280.c | 16 ++++- drivers/usb/gadget/udc/renesas_usb3.c | 5 +- drivers/usb/host/u132-hcd.c | 2 +- drivers/usb/misc/uss720.c | 4 +- drivers/usb/misc/yurex.c | 5 +- drivers/usb/serial/io_ti.h | 2 +- drivers/usb/serial/ti_usb_3410_5052.c | 2 +- drivers/usb/storage/scsiglue.c | 9 +++ drivers/usb/storage/uas.c | 21 +++++++ drivers/usb/storage/unusual_devs.h | 7 +++ drivers/video/fbdev/core/modedb.c | 41 ++++++++---- drivers/video/fbdev/goldfishfb.c | 1 + drivers/video/fbdev/omap/omapfb_main.c | 2 +- drivers/video/fbdev/pxafb.c | 4 +- drivers/video/fbdev/via/viafbdev.c | 3 +- fs/binfmt_elf.c | 2 +- fs/cifs/readdir.c | 11 +++- fs/cifs/smb2pdu.c | 25 +++++--- fs/configfs/dir.c | 11 ++++ fs/gfs2/bmap.c | 2 +- fs/gfs2/rgrp.c | 3 +- fs/nfs/nfs4proc.c | 10 ++- fs/nfs/nfs4state.c | 2 + fs/pstore/ram_core.c | 17 ++++- include/linux/crypto.h | 5 ++ include/linux/mlx5/driver.h | 2 +- kernel/audit_watch.c | 12 +++- kernel/events/core.c | 4 ++ kernel/rcu/tree.c | 6 ++ kernel/rcu/tree.h | 4 ++ net/mac80211/cfg.c | 2 +- net/mac80211/key.c | 24 ++++--- net/rds/bind.c | 5 +- net/xfrm/xfrm_policy.c | 5 +- scripts/Kbuild.include | 3 + security/integrity/evm/evm_crypto.c | 3 +- security/smack/smack_lsm.c | 14 +++-- sound/core/pcm_lib.c | 14 +++-- sound/isa/msnd/msnd_pinnacle.c | 4 +- sound/usb/quirks-table.h | 3 +- tools/hv/hv_kvp_daemon.c | 2 +- tools/perf/arch/powerpc/util/skip-callchain-idx.c | 10 ++- tools/perf/tests/builtin-test.c | 2 +- tools/testing/selftests/timers/raw_skew.c | 5 ++ virt/kvm/arm/vgic/vgic-init.c | 4 ++ 114 files changed, 630 insertions(+), 337 deletions(-)

6 years, 7 months

7
120
0 0

[PATCH 4.4 00/70] 4.4.158-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.4.158 release. There are 70 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 Sep 26 11:30:25 UTC 2018. 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.158-rc… 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 <gregkh(a)linuxfoundation.org> Linux 4.4.158-rc1 Paul Burton <paul.burton(a)imgtec.com> MIPS: VDSO: Drop gic_get_usm_range() usage Paul Burton <paul.burton(a)mips.com> MIPS: VDSO: Match data page cache colouring when D$ aliases David Rivshin <drivshin(a)allworx.com> drivers: net: cpsw: fix segfault in case of bad phy-handle Dan Carpenter <dan.carpenter(a)oracle.com> mei: bus: type promotion bug in mei_nfc_if_version() Johan Hovold <johan(a)kernel.org> USB: serial: ti_usb_3410_5052: fix array underflow in completion handler Douglas Anderson <dianders(a)chromium.org> pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant Bart Van Assche <bart.vanassche(a)wdc.com> IB/nes: Fix a compiler warning Dan Carpenter <dan.carpenter(a)oracle.com> drm/panel: type promotion bug in s6e8aa0_read_mtp_id() John Stultz <john.stultz(a)linaro.org> selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Timo Wischer <twischer(a)de.adit-jv.com> ALSA: pcm: Fix snd_interval_refine first/last with open min/max Zhouyang Jia <jiazhouyang09(a)gmail.com> rtc: bq4802: add error handling for devm_ioremap Wei Lu <wei.lu2(a)amd.com> drm/amdkfd: Fix error codes in kfd_get_process Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> gpiolib: Mark gpio_suffixes array with __maybe_unused Robin Murphy <robin.murphy(a)arm.com> coresight: tpiu: Fix disabling timeouts Suzuki K Poulose <suzuki.poulose(a)arm.com> coresight: Handle errors in finding input/output ports Julia Lawall <Julia.Lawall(a)lip6.fr> parport: sunbpp: fix error return code Thierry Reding <treding(a)nvidia.com> drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping Nicholas Mc Guire <hofrat(a)osadl.org> ARM: hisi: check of_iomap and fix missing of_node_put Nicholas Mc Guire <hofrat(a)osadl.org> ARM: hisi: fix error handling and missing of_node_put Nicholas Mc Guire <hofrat(a)osadl.org> ARM: hisi: handle of_iomap and fix missing of_node_put Paul Burton <paul.burton(a)mips.com> MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads Jann Horn <jannh(a)google.com> mtdchar: fix overflows in adjustment of `count` Ronny Chevalier <ronny.chevalier(a)hp.com> audit: fix use-after-free in audit_add_watch Maciej W. Rozycki <macro(a)mips.com> binfmt_elf: Respect error return from `regset->active' Dan Carpenter <dan.carpenter(a)oracle.com> CIFS: fix wrapping bugs in num_entries() Dan Carpenter <dan.carpenter(a)oracle.com> cifs: prevent integer overflow in nxt_dir_entry() Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt() Ben Hutchings <ben.hutchings(a)codethink.co.uk> USB: yurex: Fix buffer over-read in yurex_write() Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: misc: uss720: Fix two sleep-in-atomic-context bugs Johan Hovold <johan(a)kernel.org> USB: serial: io_ti: fix array underflow in completion handler Alan Stern <stern(a)rowland.harvard.edu> USB: net2280: Fix erroneous synchronization change Maxence Duprès <xpros64(a)hotmail.fr> USB: add quirk for WORLDE Controller KS49 or Prodipe MIDI 49C USB controller Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: host: u132-hcd: Fix a sleep-in-atomic-context bug in u132_get_frame() Mathias Nyman <mathias.nyman(a)linux.intel.com> usb: Avoid use-after-free by flushing endpoints early in usb_set_interface() Tim Anderson <tsa(a)biglakesoftware.com> USB: Add quirk to support DJI CineSSD Mathias Nyman <mathias.nyman(a)linux.intel.com> usb: Don't die twice if PCI xhci host is not responding in resume Gustavo A. R. Silva <gustavo(a)embeddedor.com> misc: hmc6352: fix potential Spectre v1 K. Y. Srinivasan <kys(a)microsoft.com> Tools: hv: Fix a bug in the key delete code Aaron Knister <aaron.s.knister(a)nasa.gov> IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler Juergen Gross <jgross(a)suse.com> xen/netfront: fix waiting for xenbus state change Bin Yang <bin.yang(a)intel.com> pstore: Fix incorrect persistent ram buffer mapping Parav Pandit <parav(a)mellanox.com> RDMA/cma: Protect cma dev list with lock Xiao Liang <xiliang(a)redhat.com> xen-netfront: fix warn message as irq device name has '/' Michael Müller <michael(a)fds-team.de> crypto: sharah - Unregister correct algorithms for SAHARA 3 Randy Dunlap <rdunlap(a)infradead.org> platform/x86: toshiba_acpi: Fix defined but not used build warnings Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: reset layer2 attribute on layer switch Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: fix race in used-buffer accounting Loic Poulain <loic.poulain(a)linaro.org> arm64: dts: qcom: db410c: Fix Bluetooth LED trigger Vitaly Kuznetsov <vkuznets(a)redhat.com> xen-netfront: fix queue name setting Manikanta Pubbisetty <mpubbise(a)codeaurora.org> mac80211: restrict delayed tailroom needed decrement Paul Cercueil <paul(a)crapouillou.net> MIPS: jz4740: Bump zload address Nicholas Piggin <npiggin(a)gmail.com> powerpc/powernv: opal_put_chars partial write fix Sandipan Das <sandipan(a)linux.ibm.com> perf powerpc: Fix callchain ip filtering Krzysztof Kozlowski <krzk(a)kernel.org> ARM: exynos: Clear global variable on init error path Fredrik Noring <noring(a)nocrew.org> fbdev: Distinguish between interlaced and progressive modes Sandipan Das <sandipan(a)linux.ibm.com> perf powerpc: Fix callchain ip filtering when return address is in a register Randy Dunlap <rdunlap(a)infradead.org> fbdev/via: fix defined but not used warning Anton Vasilyev <vasilyev(a)ispras.ru> video: goldfishfb: fix memory leak on driver remove Dan Carpenter <dan.carpenter(a)oracle.com> fbdev: omapfb: off by one in omapfb_register_client() Randy Dunlap <rdunlap(a)infradead.org> mtd/maps: fix solutionengine.c printk format warnings Hans Verkuil <hverkuil(a)xs4all.nl> media: videobuf2-core: check for q->error in vb2_core_qbuf() Felix Fietkau <nbd(a)nbd.name> MIPS: ath79: fix system restart John Keeping <john(a)metanate.com> dmaengine: pl330: fix irq race with terminate_all Masahiro Yamada <yamada.masahiro(a)socionext.com> kbuild: add .DELETE_ON_ERROR special target Nicholas Mc Guire <hofrat(a)osadl.org> clk: imx6ul: fix missing of_node_put() Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Special-case rindex for gfs2_grow YueHaibing <yuehaibing(a)huawei.com> xfrm: fix 'passing zero to ERR_PTR()' warning Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro Takashi Iwai <tiwai(a)suse.de> ALSA: msnd: Fix the default sample sizes Miao Zhong <zhongmiao(a)hisilicon.com> iommu/arm-smmu-v3: sync the OVACKFLG to PRIQ consumer register ------------- Diffstat: Makefile | 4 +-- arch/arm/mach-exynos/suspend.c | 1 + arch/arm/mach-hisi/hotplug.c | 41 ++++++++++++++-------- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 +- arch/mips/ath79/setup.c | 1 + arch/mips/include/asm/mach-ath79/ath79.h | 1 + arch/mips/jz4740/Platform | 2 +- arch/mips/kernel/vdso.c | 35 ++++++++++++------ arch/mips/loongson64/common/cs5536/cs5536_ohci.c | 2 +- arch/powerpc/platforms/powernv/opal.c | 2 +- drivers/clk/imx/clk-imx6ul.c | 1 + drivers/crypto/sahara.c | 4 +-- drivers/dma/pl330.c | 5 +-- drivers/gpio/gpiolib.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 ++ drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 13 +++++++ drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 2 +- drivers/hwtracing/coresight/coresight-tpiu.c | 7 ++-- drivers/hwtracing/coresight/coresight.c | 7 ++-- drivers/infiniband/core/cma.c | 12 ++++--- drivers/infiniband/hw/nes/nes.h | 2 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 ++ drivers/iommu/arm-smmu-v3.c | 1 + drivers/media/v4l2-core/videobuf2-core.c | 5 +++ drivers/misc/hmc6352.c | 2 ++ drivers/misc/mei/bus-fixup.c | 2 +- drivers/mtd/maps/solutionengine.c | 6 ++-- drivers/mtd/mtdchar.c | 10 ++++-- drivers/net/ethernet/ti/cpsw.c | 37 +++++++++++-------- drivers/net/xen-netfront.c | 30 ++++++++-------- drivers/parport/parport_sunbpp.c | 8 +++-- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 32 ++++++++++++----- drivers/platform/x86/toshiba_acpi.c | 3 +- drivers/rtc/rtc-bq4802.c | 4 +++ drivers/s390/net/qeth_core_main.c | 3 +- drivers/s390/net/qeth_core_sys.c | 1 + drivers/usb/class/cdc-wdm.c | 2 +- drivers/usb/core/hcd-pci.c | 2 -- drivers/usb/core/message.c | 11 ++++++ drivers/usb/core/quirks.c | 7 ++++ drivers/usb/gadget/udc/net2280.c | 16 +++++++-- drivers/usb/host/u132-hcd.c | 2 +- drivers/usb/misc/uss720.c | 4 +-- drivers/usb/misc/yurex.c | 5 +-- drivers/usb/serial/io_ti.h | 2 +- drivers/usb/serial/ti_usb_3410_5052.h | 2 +- drivers/usb/storage/scsiglue.c | 9 +++++ drivers/usb/storage/unusual_devs.h | 7 ++++ drivers/video/fbdev/core/modedb.c | 41 ++++++++++++++++------ drivers/video/fbdev/goldfishfb.c | 1 + drivers/video/fbdev/omap/omapfb_main.c | 2 +- drivers/video/fbdev/via/viafbdev.c | 3 +- fs/binfmt_elf.c | 2 +- fs/cifs/readdir.c | 11 ++++-- fs/cifs/smb2pdu.c | 25 +++++++------ fs/gfs2/bmap.c | 2 +- fs/pstore/ram_core.c | 17 +++++++-- kernel/audit_watch.c | 12 ++++++- net/mac80211/cfg.c | 2 +- net/mac80211/key.c | 24 ++++++++----- net/xfrm/xfrm_policy.c | 5 ++- scripts/Kbuild.include | 3 ++ sound/core/pcm_lib.c | 14 +++++--- sound/isa/msnd/msnd_pinnacle.c | 4 +-- sound/usb/quirks-table.h | 3 +- tools/hv/hv_kvp_daemon.c | 2 +- tools/perf/arch/powerpc/util/skip-callchain-idx.c | 10 ++++-- tools/testing/selftests/timers/raw_skew.c | 5 +++ 68 files changed, 389 insertions(+), 162 deletions(-)

6 years, 7 months

5
76
0 0

[PATCH 3.18 000/105] 3.18.123-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 3.18.123 release. There are 105 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 Sep 26 11:30:30 UTC 2018. 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/v3.x/stable-review/patch-3.18.123-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-3.18.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 3.18.123-rc1 Johan Hovold <johan(a)kernel.org> USB: serial: ti_usb_3410_5052: fix array underflow in completion handler Bart Van Assche <bart.vanassche(a)wdc.com> IB/nes: Fix a compiler warning Dan Carpenter <dan.carpenter(a)oracle.com> drm/panel: type promotion bug in s6e8aa0_read_mtp_id() Timo Wischer <twischer(a)de.adit-jv.com> ALSA: pcm: Fix snd_interval_refine first/last with open min/max Zhouyang Jia <jiazhouyang09(a)gmail.com> rtc: bq4802: add error handling for devm_ioremap Julia Lawall <Julia.Lawall(a)lip6.fr> parport: sunbpp: fix error return code Nicholas Mc Guire <hofrat(a)osadl.org> ARM: hisi: check of_iomap and fix missing of_node_put Nicholas Mc Guire <hofrat(a)osadl.org> ARM: hisi: handle of_iomap and fix missing of_node_put Paul Burton <paul.burton(a)mips.com> MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads Jann Horn <jannh(a)google.com> mtdchar: fix overflows in adjustment of `count` Ronny Chevalier <ronny.chevalier(a)hp.com> audit: fix use-after-free in audit_add_watch Maciej W. Rozycki <macro(a)mips.com> binfmt_elf: Respect error return from `regset->active' Dan Carpenter <dan.carpenter(a)oracle.com> CIFS: fix wrapping bugs in num_entries() Dan Carpenter <dan.carpenter(a)oracle.com> cifs: prevent integer overflow in nxt_dir_entry() Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt() Ben Hutchings <ben.hutchings(a)codethink.co.uk> USB: yurex: Fix buffer over-read in yurex_write() Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: misc: uss720: Fix two sleep-in-atomic-context bugs Johan Hovold <johan(a)kernel.org> USB: serial: io_ti: fix array underflow in completion handler Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: host: u132-hcd: Fix a sleep-in-atomic-context bug in u132_get_frame() Mathias Nyman <mathias.nyman(a)linux.intel.com> usb: Avoid use-after-free by flushing endpoints early in usb_set_interface() Tim Anderson <tsa(a)biglakesoftware.com> USB: Add quirk to support DJI CineSSD Mathias Nyman <mathias.nyman(a)linux.intel.com> usb: Don't die twice if PCI xhci host is not responding in resume K. Y. Srinivasan <kys(a)microsoft.com> Tools: hv: Fix a bug in the key delete code Aaron Knister <aaron.s.knister(a)nasa.gov> IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler Juergen Gross <jgross(a)suse.com> xen/netfront: fix waiting for xenbus state change Bin Yang <bin.yang(a)intel.com> pstore: Fix incorrect persistent ram buffer mapping Parav Pandit <parav(a)mellanox.com> RDMA/cma: Protect cma dev list with lock Randy Dunlap <rdunlap(a)infradead.org> platform/x86: toshiba_acpi: Fix defined but not used build warnings Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: reset layer2 attribute on layer switch Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: fix race in used-buffer accounting Manikanta Pubbisetty <mpubbise(a)codeaurora.org> mac80211: restrict delayed tailroom needed decrement Nicholas Piggin <npiggin(a)gmail.com> powerpc/powernv: opal_put_chars partial write fix Sandipan Das <sandipan(a)linux.ibm.com> perf powerpc: Fix callchain ip filtering Fredrik Noring <noring(a)nocrew.org> fbdev: Distinguish between interlaced and progressive modes Sandipan Das <sandipan(a)linux.ibm.com> perf powerpc: Fix callchain ip filtering when return address is in a register Randy Dunlap <rdunlap(a)infradead.org> fbdev/via: fix defined but not used warning Anton Vasilyev <vasilyev(a)ispras.ru> video: goldfishfb: fix memory leak on driver remove Dan Carpenter <dan.carpenter(a)oracle.com> fbdev: omapfb: off by one in omapfb_register_client() Randy Dunlap <rdunlap(a)infradead.org> mtd/maps: fix solutionengine.c printk format warnings Felix Fietkau <nbd(a)nbd.name> MIPS: ath79: fix system restart Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Special-case rindex for gfs2_grow YueHaibing <yuehaibing(a)huawei.com> xfrm: fix 'passing zero to ERR_PTR()' warning Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro Takashi Iwai <tiwai(a)suse.de> ALSA: msnd: Fix the default sample sizes Linus Torvalds <torvalds(a)linux-foundation.org> mm: get rid of vmacache_flush_all() entirely Eric Dumazet <edumazet(a)google.com> netfilter: x_tables: avoid stack-out-of-bounds read in xt_copy_counters_from_user Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: Fix use-after-free in xhci_free_virt_device Paul Burton <paul.burton(a)imgtec.com> MIPS: WARN_ON invalid DMA cache maintenance, not BUG_ON Chao Yu <yuchao0(a)huawei.com> f2fs: fix to do sanity check with {sit,nat}_ver_bitmap_bytesize Zumeng Chen <zumeng.chen(a)gmail.com> mfd: ti_am335x_tscadc: Fix struct clk memory leak Mauricio Faria de Oliveira <mfo(a)canonical.com> partitions/aix: fix usage of uninitialized lv_info and lvname structures Mauricio Faria de Oliveira <mfo(a)canonical.com> partitions/aix: append null character to print data from disk Petr Machata <petrm(a)mellanox.com> net: dcb: For wild-card lookups, use priority -1, not 0 Yelena Krivosheev <yelena(a)marvell.com> net: mvneta: fix mtu change on port without link Anton Vasilyev <vasilyev(a)ispras.ru> gpio: ml-ioh: Fix buffer underwrite on probe error path Joerg Roedel <jroedel(a)suse.de> x86/mm: Remove in_nmi() warning from vmalloc_fault() Marcel Holtmann <marcel(a)holtmann.org> Bluetooth: hidp: Fix handling of strncpy for hid->name information Anton Vasilyev <vasilyev(a)ispras.ru> scsi: 3ware: fix return 0 on the error path of probe Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> ata: libahci: Correct setting of DEVSLP register Paul Burton <paul.burton(a)mips.com> MIPS: Fix ISA virt/bus conversion for non-zero PHYS_OFFSET Sven Eckelmann <sven.eckelmann(a)openmesh.com> ath10k: prevent active scans on potential unusable channels Finn Thain <fthain(a)telegraphics.com.au> macintosh/via-pmu: Add missing mmio accessors Anton Vasilyev <vasilyev(a)ispras.ru> tty: rocket: Fix possible buffer overwrite on register_PCI Dan Carpenter <dan.carpenter(a)oracle.com> uio: potential double frees if __uio_register_device() fails BingJing Chang <bingjingc(a)synology.com> md/raid5: fix data corruption of replacements after originals dropped Mike Christie <mchristi(a)redhat.com> scsi: target: fix __transport_register_session locking Johan Hedberg <johan.hedberg(a)intel.com> Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV Daniel Micay <danielmicay(a)gmail.com> staging/rts5208: Fix read overflow in memcpy Jia-Ju Bai <baijiaju1990(a)163.com> staging: rt5208: Fix a sleep-in-atomic bug in xd_copy_page Vegard Nossum <vegard.nossum(a)oracle.com> kthread: fix boot hang (regression) on MIPS/OpenRISC Vegard Nossum <vegard.nossum(a)oracle.com> kthread: Fix use-after-free if kthread fork fails Ritesh Harjani <riteshh(a)codeaurora.org> cfq: Give a chance for arming slice idle timer in case of group_idle Shubhrajyoti Datta <shubhrajyoti.datta(a)xilinx.com> i2c: xiic: Make the start and the byte count write atomic Gustavo A. R. Silva <gustavo(a)embeddedor.com> ASoC: wm8994: Fix missing break in switch Chas Williams <chas3(a)att.com> Fixes: Commit 86af955d02bb ("mm: numa: avoid waiting on freed migrated pages") Govindarajulu Varadarajan <gvaradar(a)cisco.com> enic: do not call enic_change_mtu in enic_probe Tyler Hicks <tyhicks(a)canonical.com> irda: Only insert new objects into the global database via setsockopt Tyler Hicks <tyhicks(a)canonical.com> irda: Fix memory leak caused by repeated binds of irda socket Randy Dunlap <rdunlap(a)infradead.org> kbuild: make missing $DEPMOD a Warning instead of an Error Joel Fernandes (Google) <joel(a)joelfernandes.org> debugobjects: Make stack check warning more informative Qu Wenruo <wqu(a)suse.com> btrfs: Don't remove block group that still has pinned down bytes Qu Wenruo <wqu(a)suse.com> btrfs: relocation: Only remove reloc rb_trees if reloc control has been initialized Misono Tomohiro <misono.tomohiro(a)jp.fujitsu.com> btrfs: replace: Reset on-disk dev stats value after replace Mahesh Salgaonkar <mahesh(a)linux.vnet.ibm.com> powerpc/pseries: Avoid using the size greater than RTAS_ERROR_LOG_MAX. Steve French <stfrench(a)microsoft.com> SMB3: Number of requests sent should be displayed for SMB3 not just CIFS Steve French <stfrench(a)microsoft.com> smb3: fix reset of bytes read and written stats Breno Leitao <leitao(a)debian.org> selftests/powerpc: Kill child processes on SIGINT Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: ni_mio_common: fix subdevice flags for PFI subdevice John Pittman <jpittman(a)redhat.com> dm kcopyd: avoid softlockup in run_complete_job Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> PCI: mvebu: Fix I/O space end address calculation Dan Carpenter <dan.carpenter(a)oracle.com> scsi: aic94xx: fix an error code in aic94xx_init() Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix hanging offline processing due to canceled worker Dan Carpenter <dan.carpenter(a)oracle.com> powerpc: Fix size calculation using resource_size() Jean-Philippe Brucker <jean-philippe.brucker(a)arm.com> net/9p: fix error path of p9_virtio_probe Aleh Filipovich <aleh(a)vaolix.com> platform/x86: asus-nb-wmi: Add keymap entry for lid flip action on UX360 Guenter Roeck <linux(a)roeck-us.net> mfd: sm501: Set coherent_dma_mask when creating subdevices Tan Hu <tan.hu(a)zte.com.cn> ipvs: fix race between ip_vs_conn_new() and ip_vs_del_dest() Andrey Ryabinin <aryabinin(a)virtuozzo.com> mm/fadvise.c: fix signed overflow UBSAN complaint Randy Dunlap <rdunlap(a)infradead.org> scripts: modpost: check memory allocation results OGAWA Hirofumi <hirofumi(a)mail.parknet.co.jp> fat: validate ->i_start before using Arnd Bergmann <arnd(a)arndb.de> reiserfs: change j_timestamp type to time64_t Jann Horn <jannh(a)google.com> fork: don't copy inconsistent signal handler state to child Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfs: prevent crash on exit from failed search Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> hfsplus: don't return 0 when fill_super() failed Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: check if SMB2 PDU size has been padded and suppress the warning ------------- Diffstat: Makefile | 4 +-- arch/arm/mach-hisi/hotplug.c | 33 ++++++++++++------ arch/mips/ath79/setup.c | 1 + arch/mips/include/asm/io.h | 8 ++--- arch/mips/include/asm/mach-ath79/ath79.h | 1 + arch/mips/kernel/process.c | 1 - arch/mips/loongson/common/cs5536/cs5536_ohci.c | 2 +- arch/mips/mm/c-r4k.c | 6 ++-- arch/openrisc/kernel/process.c | 2 -- arch/powerpc/platforms/powernv/opal.c | 2 +- arch/powerpc/platforms/pseries/ras.c | 2 +- arch/powerpc/sysdev/mpic_msgr.c | 2 +- arch/x86/mm/fault.c | 2 -- block/cfq-iosched.c | 3 +- block/partitions/aix.c | 13 ++++--- drivers/ata/libahci.c | 2 ++ drivers/bluetooth/Kconfig | 1 + drivers/gpio/gpio-ml-ioh.c | 3 +- drivers/gpu/drm/panel/panel-s6e8aa0.c | 2 +- drivers/i2c/busses/i2c-xiic.c | 4 +++ drivers/infiniband/core/cma.c | 12 ++++--- drivers/infiniband/hw/nes/nes.h | 2 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 ++ drivers/macintosh/via-pmu.c | 9 ++--- drivers/md/dm-kcopyd.c | 2 ++ drivers/md/raid5.c | 6 ++++ drivers/mfd/sm501.c | 1 + drivers/mfd/ti_am335x_tscadc.c | 3 +- drivers/mtd/maps/solutionengine.c | 6 ++-- drivers/mtd/mtdchar.c | 10 ++++-- drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- drivers/net/ethernet/marvell/mvneta.c | 1 - drivers/net/wireless/ath/ath10k/mac.c | 7 ++++ drivers/net/xen-netfront.c | 24 ++++++------- drivers/parport/parport_sunbpp.c | 8 +++-- drivers/pci/host/pci-mvebu.c | 2 +- drivers/platform/x86/asus-nb-wmi.c | 1 + drivers/platform/x86/toshiba_acpi.c | 3 +- drivers/rtc/rtc-bq4802.c | 4 +++ drivers/s390/block/dasd_eckd.c | 7 ++-- drivers/s390/net/qeth_core_main.c | 3 +- drivers/s390/net/qeth_core_sys.c | 1 + drivers/scsi/3w-9xxx.c | 6 +++- drivers/scsi/3w-sas.c | 3 ++ drivers/scsi/3w-xxxx.c | 2 ++ drivers/scsi/aic94xx/aic94xx_init.c | 4 ++- drivers/staging/comedi/drivers/ni_mio_common.c | 3 +- drivers/staging/rts5208/rtsx_scsi.c | 2 +- drivers/staging/rts5208/xd.c | 2 +- drivers/target/target_core_transport.c | 5 +-- drivers/tty/rocket.c | 2 +- drivers/uio/uio.c | 3 +- drivers/usb/class/cdc-wdm.c | 2 +- drivers/usb/core/hcd-pci.c | 2 -- drivers/usb/core/message.c | 11 ++++++ drivers/usb/core/quirks.c | 3 ++ drivers/usb/host/u132-hcd.c | 2 +- drivers/usb/host/xhci.c | 3 ++ drivers/usb/misc/uss720.c | 4 +-- drivers/usb/misc/yurex.c | 5 +-- drivers/usb/serial/io_ti.h | 2 +- drivers/usb/serial/ti_usb_3410_5052.h | 2 +- drivers/usb/storage/scsiglue.c | 9 +++++ drivers/usb/storage/unusual_devs.h | 7 ++++ drivers/video/fbdev/core/modedb.c | 41 +++++++++++++++++------ drivers/video/fbdev/goldfishfb.c | 1 + drivers/video/fbdev/omap/omapfb_main.c | 2 +- drivers/video/fbdev/via/viafbdev.c | 3 +- fs/binfmt_elf.c | 2 +- fs/btrfs/dev-replace.c | 6 ++++ fs/btrfs/extent-tree.c | 2 +- fs/btrfs/relocation.c | 23 +++++++------ fs/cifs/cifs_debug.c | 8 +++++ fs/cifs/readdir.c | 11 ++++-- fs/cifs/smb2misc.c | 7 ++++ fs/cifs/smb2pdu.c | 27 +++++++++------ fs/f2fs/super.c | 21 ++++++++++-- fs/fat/cache.c | 19 +++++++---- fs/fat/fat.h | 5 +++ fs/fat/fatent.c | 6 ++-- fs/gfs2/bmap.c | 2 +- fs/hfs/brec.c | 7 ++-- fs/hfsplus/super.c | 4 ++- fs/pstore/ram_core.c | 17 ++++++++-- fs/reiserfs/reiserfs.h | 2 +- include/linux/mm_types.h | 2 +- include/linux/sched.h | 2 +- include/linux/vmacache.h | 5 --- kernel/audit_watch.c | 12 ++++++- kernel/fork.c | 19 ++++++++--- lib/debugobjects.c | 7 ++-- mm/debug.c | 4 +-- mm/fadvise.c | 8 +++-- mm/huge_memory.c | 2 +- mm/vmacache.c | 36 -------------------- net/9p/trans_virtio.c | 3 +- net/bluetooth/hidp/core.c | 2 +- net/dcb/dcbnl.c | 11 +++--- net/irda/af_irda.c | 13 ++++++- net/mac80211/cfg.c | 2 +- net/mac80211/key.c | 24 ++++++++----- net/netfilter/ipvs/ip_vs_core.c | 15 ++++++--- net/netfilter/x_tables.c | 4 +-- net/xfrm/xfrm_policy.c | 5 ++- scripts/depmod.sh | 4 +-- scripts/mod/modpost.c | 8 ++--- sound/core/pcm_lib.c | 14 +++++--- sound/isa/msnd/msnd_pinnacle.c | 4 +-- sound/soc/codecs/wm8994.c | 1 + sound/usb/quirks-table.h | 3 +- tools/hv/hv_kvp_daemon.c | 2 +- tools/perf/arch/powerpc/util/skip-callchain-idx.c | 10 ++++-- tools/testing/selftests/powerpc/harness.c | 18 ++++++---- 113 files changed, 491 insertions(+), 259 deletions(-)

6 years, 7 months

5
118
0 0

Re: [PATCH] rpmsg: core: add support to power domains for devices

by Suman Anna

Hi Srini, On 09/25/2018 03:29 AM, Srinivas Kandagatla wrote: > Hi Suman, > > On 25/09/18 01:25, Suman Anna wrote: >> Hi Srinivas, >> >> On 06/15/2018 04:59 AM, Srinivas Kandagatla wrote: >>> Some of the rpmsg devices need to switch on power domains to communicate >>> with remote processor. For example on Qualcomm DB820c platform LPASS >>> power domain needs to switched on for any kind of audio services. >>> This patch adds the missing power domain support in rpmsg core. >>> >>> Without this patch attempting to play audio via QDSP on DB820c would >>> reboot the system. >>> >>> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> >>> --- >>> drivers/rpmsg/rpmsg_core.c | 7 +++++++ >>> 1 file changed, 7 insertions(+) >>> >>> diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c >>> index b714a543a91d..8122807db380 100644 >>> --- a/drivers/rpmsg/rpmsg_core.c >>> +++ b/drivers/rpmsg/rpmsg_core.c >>> @@ -15,6 +15,7 @@ >>> #include <linux/module.h> >>> #include <linux/rpmsg.h> >>> #include <linux/of_device.h> >>> +#include <linux/pm_domain.h> >>> #include <linux/slab.h> >>> #include "rpmsg_internal.h" >>> @@ -449,6 +450,10 @@ static int rpmsg_dev_probe(struct device *dev) >>> struct rpmsg_endpoint *ept = NULL; >>> int err; >>> + err = dev_pm_domain_attach(dev, true); >>> + if (err) >>> + goto out; >> >> This patch has broken the virtio-rpmsg stack based rpmsg devices. These >> devices are non-DT and the rpmsg_dev_probe() is now failing with -19 >> (-ENODEV) error code. >> > > There seems to be some dependency on this patch ( > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… > ) which seems to rework the return values from acpi_dev_pm_attach() and > genpd_dev_pm_attach() > OK, I see that dependent commit is part of the 4.18 Linux kernel. So mainline kernel has no issues, but this patch was picked up in 4.14.71 (don't know why) as commit 1ed3a9307230, so 4.14 stable is broken. So, how do we proceed here - don't think we can pick all those dependent patches against stable. regards Suman > > > --srini > > >> Loic, Arnaud, >> Can one of you double-confirm this behavior on ST platforms as well? >> The patch came through 4.14.71 stable release and broke our downstream >> kernels. >> >> regards >> Suman >> >>> + >>> if (rpdrv->callback) { >>> strncpy(chinfo.name, rpdev->id.name, RPMSG_NAME_SIZE); >>> chinfo.src = rpdev->src; >>> @@ -490,6 +495,8 @@ static int rpmsg_dev_remove(struct device *dev) >>> rpdrv->remove(rpdev); >>> + dev_pm_domain_detach(dev, true); >>> + >>> if (rpdev->ept) >>> rpmsg_destroy_ept(rpdev->ept); >>> >>

6 years, 7 months

1
0
0 0

[PATCH v2 0/2] virtio/s390: fix some races in virtio-ccw

by Halil Pasic

The trigger for the series is this bug report: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1788432 Changelog: v1 -> v2: * improve on commit messages, add cc:stable RFC -> v1: * do mutual exclusion on a per device basis in ccw_io_helper() Halil Pasic (2): virtio/s390: avoid race on vcdev->config virtio/s390: fix race in ccw_io_helper() drivers/s390/virtio/virtio_ccw.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) -- 2.16.4

6 years, 7 months

2
3
0 0

Editing for 5

by Heather

Want editing for your photos? We can help you for this. We can do cutting out and retouching for your ecommerce photos, jewelry photos retouching, portrait photos or wedding photos. Turnaround time is fast Send us one photo, we wil do testing for you. Thanks, Heather

6 years, 7 months

1
0
0 0

Editing for 4

by Heather

Want editing for your photos? We can help you for this. We can do cutting out and retouching for your ecommerce photos, jewelry photos retouching, portrait photos or wedding photos. Turnaround time is fast Send us one photo, we wil do testing for you. Thanks, Heather

6 years, 7 months

1
0
0 0

[PATCH 35/40] drm/i915: Fix I915_EXEC_RING_MASK

by Chris Wilson

This was supposed to be a mask of all known rings, but it is being used by execbuffer to filter out invalid rings, and so is instead mapping high unused values onto valid rings. Instead of a mask of all known rings, we need it to be the mask of all possible rings. Fixes: 549f7365820a ("drm/i915: Enable SandyBridge blitter ring") Fixes: de1add360522 ("drm/i915: Decouple execbuf uAPI from internal implementation") Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin(a)intel.com> Cc: <stable(a)vger.kernel.org> # v4.6+ --- include/uapi/drm/i915_drm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index adb9fed86ef7..65b0b84419f3 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -984,7 +984,7 @@ struct drm_i915_gem_execbuffer2 { * struct drm_i915_gem_exec_fence *fences. */ __u64 cliprects_ptr; -#define I915_EXEC_RING_MASK (7<<0) +#define I915_EXEC_RING_MASK (0x3f) #define I915_EXEC_DEFAULT (0<<0) #define I915_EXEC_RENDER (1<<0) #define I915_EXEC_BSD (2<<0) -- 2.19.0

6 years, 7 months

2
1
0 0

[PATCH v6 0/7] mm: Merge hmm into devm_memremap_pages, mark GPL-only

by Dan Williams

Changes since v5 [1]: * Move the percpu-ref kill function to be passed in via @pgmap (Christoph) * Added Christoph's ack for patches 2 and 4 * Added Jérôme's Reviewed-by for patches 2-6 * Fix MEMORY_DEVICE_PRIVATE support (Jérôme) [1]: https://lkml.org/lkml/2018/9/13/104 --- Hi Andrew, Jérôme has reviewed the cleanups, thanks Jérôme. We still disagree on the EXPORT_SYMBOL_GPL status of the core HMM implementation, but Logan, Christoph and I continue to support marking all devm_memremap_pages() derivatives EXPORT_SYMBOL_GPL. HMM has been upstream for over a year, with no in-tree users it is clear it was designed first and foremost for out of tree drivers. It takes advantage of a facility Christoph and I spearheaded to support persistent memory. It continues to see expanding use cases with no clear end date when it will stop attracting features / revisions. It is not suitable to export devm_memremap_pages() as a stable 3rd party driver api. devm_memremap_pages() is a facility that can create struct page entries for any arbitrary range and give out-of-tree drivers the ability to subvert core aspects of page management. It, and anything derived from it (e.g. hmm, pcip2p, etc...), is a deep integration point into the core kernel, and an EXPORT_SYMBOL_GPL() interface. Commit 31c5bda3a656 "mm: fix exports that inadvertently make put_page() EXPORT_SYMBOL_GPL" was merged ahead of this series to relieve some of the pressure from innocent consumers of put_page(), but now we need this series to address *producers* of device pages. More details and justification in the changelogs. The 0day infrastructure has reported success across 152 configs and this survives the libnvdimm unit test suite. Aside from the controversial bits the diffstat is compelling at: 7 files changed, 127 insertions(+), 321 deletions(-) Note that the series has some minor collisions with Alex's recent series to improve devm_memremap_pages() scalability [2]. So, whichever you take first the other will need a minor rebase. [2]: https://www.lkml.org/lkml/2018/9/11/10 --- Dan Williams (7): mm, devm_memremap_pages: Mark devm_memremap_pages() EXPORT_SYMBOL_GPL mm, devm_memremap_pages: Kill mapping "System RAM" support mm, devm_memremap_pages: Fix shutdown handling mm, devm_memremap_pages: Add MEMORY_DEVICE_PRIVATE support mm, hmm: Use devm semantics for hmm_devmem_{add,remove} mm, hmm: Replace hmm_devmem_pages_create() with devm_memremap_pages() mm, hmm: Mark hmm_devmem_{add,add_resource} EXPORT_SYMBOL_GPL drivers/dax/pmem.c | 14 -- drivers/nvdimm/pmem.c | 13 +- include/linux/hmm.h | 4 include/linux/memremap.h | 2 kernel/memremap.c | 95 +++++++----- mm/hmm.c | 303 +++++-------------------------------- tools/testing/nvdimm/test/iomap.c | 17 ++ 7 files changed, 127 insertions(+), 321 deletions(-)

6 years, 7 months

1
1
0 0

[PATCH v7 1/9] KVM: arm/arm64: Ensure only THP is candidate for adjustment

by Punit Agrawal

PageTransCompoundMap() returns true for hugetlbfs and THP hugepages. This behaviour incorrectly leads to stage 2 faults for unsupported hugepage sizes (e.g., 64K hugepage with 4K pages) to be treated as THP faults. Tighten the check to filter out hugetlbfs pages. This also leads to consistently mapping all unsupported hugepage sizes as PTE level entries at stage 2. Signed-off-by: Punit Agrawal <punit.agrawal(a)arm.com> Cc: Christoffer Dall <christoffer.dall(a)arm.com> Cc: Marc Zyngier <marc.zyngier(a)arm.com> Cc: Suzuki Poulose <suzuki.poulose(a)arm.com> Cc: stable(a)vger.kernel.org # v4.13+ --- virt/kvm/arm/mmu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c index 7e477b3cae5b..c23a1b323aad 100644 --- a/virt/kvm/arm/mmu.c +++ b/virt/kvm/arm/mmu.c @@ -1231,8 +1231,14 @@ static bool transparent_hugepage_adjust(kvm_pfn_t *pfnp, phys_addr_t *ipap) { kvm_pfn_t pfn = *pfnp; gfn_t gfn = *ipap >> PAGE_SHIFT; + struct page *page = pfn_to_page(pfn); - if (PageTransCompoundMap(pfn_to_page(pfn))) { + /* + * PageTransCompoungMap() returns true for THP and + * hugetlbfs. Make sure the adjustment is done only for THP + * pages. + */ + if (!PageHuge(page) && PageTransCompoundMap(page)) { unsigned long mask; /* * The address we faulted on is backed by a transparent huge -- 2.18.0

6 years, 7 months

2
1
0 0

[iw_cxgb4 linux-4.18.y] iw_cxgb4: only allow 1 flush on user qps

by Steve Wise

commit 308aa2b8f7b7db3332a7d41099fd37851fb793b2 upstream Once the qp has been flushed, it cannot be flushed again. The user qp flush logic wasn't enforcing it however. The bug can cause touch-after-free crashes like: Unable to handle kernel paging request for data at address 0x000001ec Faulting instruction address: 0xc008000016069100 Oops: Kernel access of bad area, sig: 11 [#1] ... NIP [c008000016069100] flush_qp+0x80/0x480 [iw_cxgb4] LR [c00800001606cd6c] c4iw_modify_qp+0x71c/0x11d0 [iw_cxgb4] Call Trace: [c00800001606cd6c] c4iw_modify_qp+0x71c/0x11d0 [iw_cxgb4] [c00800001606e868] c4iw_ib_modify_qp+0x118/0x200 [iw_cxgb4] [c0080000119eae80] ib_security_modify_qp+0xd0/0x3d0 [ib_core] [c0080000119c4e24] ib_modify_qp+0xc4/0x2c0 [ib_core] [c008000011df0284] iwcm_modify_qp_err+0x44/0x70 [iw_cm] [c008000011df0fec] destroy_cm_id+0xcc/0x370 [iw_cm] [c008000011ed4358] rdma_destroy_id+0x3c8/0x520 [rdma_cm] [c0080000134b0540] ucma_close+0x90/0x1b0 [rdma_ucm] [c000000000444da4] __fput+0xe4/0x2f0 So fix flush_qp() to only flush the wq once. Cc: stable(a)vger.kernel.org Signed-off-by: Steve Wise <swise(a)opengridcomputing.com> Signed-off-by: Jason Gunthorpe <jgg(a)mellanox.com> --- drivers/infiniband/hw/cxgb4/qp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c index aef53305f1c3..d97581ae3bf9 100644 --- a/drivers/infiniband/hw/cxgb4/qp.c +++ b/drivers/infiniband/hw/cxgb4/qp.c @@ -1388,6 +1388,12 @@ static void flush_qp(struct c4iw_qp *qhp) schp = to_c4iw_cq(qhp->ibqp.send_cq); if (qhp->ibqp.uobject) { + + /* for user qps, qhp->wq.flushed is protected by qhp->mutex */ + if (qhp->wq.flushed) + return; + + qhp->wq.flushed = 1; t4_set_wq_in_error(&qhp->wq); t4_set_cq_in_error(&rchp->cq); spin_lock_irqsave(&rchp->comp_handler_lock, flag); -- 1.8.3.1

6 years, 7 months

1
0
0 0

[iw_cxgb4 linux-4.4.y] iw_cxgb4: only allow 1 flush on user qps

by Steve Wise

commit 308aa2b8f7b7db3332a7d41099fd37851fb793b2 upstream Once the qp has been flushed, it cannot be flushed again. The user qp flush logic wasn't enforcing it however. The bug can cause touch-after-free crashes like: Unable to handle kernel paging request for data at address 0x000001ec Faulting instruction address: 0xc008000016069100 Oops: Kernel access of bad area, sig: 11 [#1] ... NIP [c008000016069100] flush_qp+0x80/0x480 [iw_cxgb4] LR [c00800001606cd6c] c4iw_modify_qp+0x71c/0x11d0 [iw_cxgb4] Call Trace: [c00800001606cd6c] c4iw_modify_qp+0x71c/0x11d0 [iw_cxgb4] [c00800001606e868] c4iw_ib_modify_qp+0x118/0x200 [iw_cxgb4] [c0080000119eae80] ib_security_modify_qp+0xd0/0x3d0 [ib_core] [c0080000119c4e24] ib_modify_qp+0xc4/0x2c0 [ib_core] [c008000011df0284] iwcm_modify_qp_err+0x44/0x70 [iw_cm] [c008000011df0fec] destroy_cm_id+0xcc/0x370 [iw_cm] [c008000011ed4358] rdma_destroy_id+0x3c8/0x520 [rdma_cm] [c0080000134b0540] ucma_close+0x90/0x1b0 [rdma_ucm] [c000000000444da4] __fput+0xe4/0x2f0 So fix flush_qp() to only flush the wq once. Cc: stable(a)vger.kernel.org Signed-off-by: Steve Wise <swise(a)opengridcomputing.com> Signed-off-by: Jason Gunthorpe <jgg(a)mellanox.com> Conflicts: drivers/infiniband/hw/cxgb4/qp.c --- drivers/infiniband/hw/cxgb4/qp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c index 53aa7515f542..04206c600098 100644 --- a/drivers/infiniband/hw/cxgb4/qp.c +++ b/drivers/infiniband/hw/cxgb4/qp.c @@ -1183,6 +1183,12 @@ static void flush_qp(struct c4iw_qp *qhp) t4_set_wq_in_error(&qhp->wq); if (qhp->ibqp.uobject) { + + /* for user qps, qhp->wq.flushed is protected by qhp->mutex */ + if (qhp->wq.flushed) + return; + + qhp->wq.flushed = 1; t4_set_cq_in_error(&rchp->cq); spin_lock_irqsave(&rchp->comp_handler_lock, flag); (*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context); -- 1.8.3.1

6 years, 7 months

1
0
0 0

[PATCH] block: use nanosecond resolution for iostat

by Omar Sandoval

From: Omar Sandoval <osandov(a)fb.com> Klaus Kusche reported that the I/O busy time in /proc/diskstats was not updating properly on 4.18. This is because we started using ktime to track elapsed time, and we convert nanoseconds to jiffies when we update the partition counter. However, this gets rounded down, so any I/Os that take less than a jiffy are not accounted for. Previously in this case, the value of jiffies would sometimes increment while we were doing I/O, so at least some I/Os were accounted for. Let's convert the stats to use nanoseconds internally. We still report milliseconds as before, now more accurately than ever. The value is still truncated to 32 bits for backwards compatibility. Fixes: 522a777566f5 ("block: consolidate struct request timestamp fields") Cc: stable(a)vger.kernel.org Reported-by: Klaus Kusche <klaus.kusche(a)computerix.info> Signed-off-by: Omar Sandoval <osandov(a)fb.com> --- block/bio.c | 2 +- block/blk-core.c | 4 +--- block/genhd.c | 6 +++--- block/partition-generic.c | 6 +++--- include/linux/genhd.h | 5 ++++- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/block/bio.c b/block/bio.c index 8c680a776171..0093bed81c0e 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1684,7 +1684,7 @@ void generic_end_io_acct(struct request_queue *q, int req_op, const int sgrp = op_stat_group(req_op); int cpu = part_stat_lock(); - part_stat_add(cpu, part, ticks[sgrp], duration); + part_stat_add(cpu, part, nsecs[sgrp], jiffies_to_nsecs(duration)); part_round_stats(q, cpu, part); part_dec_in_flight(q, part, op_is_write(req_op)); diff --git a/block/blk-core.c b/block/blk-core.c index 4dbc93f43b38..cff0a60ee200 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2733,17 +2733,15 @@ void blk_account_io_done(struct request *req, u64 now) * containing request is enough. */ if (blk_do_io_stat(req) && !(req->rq_flags & RQF_FLUSH_SEQ)) { - unsigned long duration; const int sgrp = op_stat_group(req_op(req)); struct hd_struct *part; int cpu; - duration = nsecs_to_jiffies(now - req->start_time_ns); cpu = part_stat_lock(); part = req->part; part_stat_inc(cpu, part, ios[sgrp]); - part_stat_add(cpu, part, ticks[sgrp], duration); + part_stat_add(cpu, part, nsecs[sgrp], now - req->start_time_ns); part_round_stats(req->q, cpu, part); part_dec_in_flight(req->q, part, rq_data_dir(req)); diff --git a/block/genhd.c b/block/genhd.c index 8cc719a37b32..be5bab20b2ab 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1343,18 +1343,18 @@ static int diskstats_show(struct seq_file *seqf, void *v) part_stat_read(hd, ios[STAT_READ]), part_stat_read(hd, merges[STAT_READ]), part_stat_read(hd, sectors[STAT_READ]), - jiffies_to_msecs(part_stat_read(hd, ticks[STAT_READ])), + (unsigned int)part_stat_read_msecs(hd, STAT_READ), part_stat_read(hd, ios[STAT_WRITE]), part_stat_read(hd, merges[STAT_WRITE]), part_stat_read(hd, sectors[STAT_WRITE]), - jiffies_to_msecs(part_stat_read(hd, ticks[STAT_WRITE])), + (unsigned int)part_stat_read_msecs(hd, STAT_WRITE), inflight[0], jiffies_to_msecs(part_stat_read(hd, io_ticks)), jiffies_to_msecs(part_stat_read(hd, time_in_queue)), part_stat_read(hd, ios[STAT_DISCARD]), part_stat_read(hd, merges[STAT_DISCARD]), part_stat_read(hd, sectors[STAT_DISCARD]), - jiffies_to_msecs(part_stat_read(hd, ticks[STAT_DISCARD])) + (unsigned int)part_stat_read_msecs(hd, STAT_DISCARD) ); } disk_part_iter_exit(&piter); diff --git a/block/partition-generic.c b/block/partition-generic.c index 5a8975a1201c..d3d14e81fb12 100644 --- a/block/partition-generic.c +++ b/block/partition-generic.c @@ -136,18 +136,18 @@ ssize_t part_stat_show(struct device *dev, part_stat_read(p, ios[STAT_READ]), part_stat_read(p, merges[STAT_READ]), (unsigned long long)part_stat_read(p, sectors[STAT_READ]), - jiffies_to_msecs(part_stat_read(p, ticks[STAT_READ])), + (unsigned int)part_stat_read_msecs(p, STAT_READ), part_stat_read(p, ios[STAT_WRITE]), part_stat_read(p, merges[STAT_WRITE]), (unsigned long long)part_stat_read(p, sectors[STAT_WRITE]), - jiffies_to_msecs(part_stat_read(p, ticks[STAT_WRITE])), + (unsigned int)part_stat_read_msecs(p, STAT_WRITE), inflight[0], jiffies_to_msecs(part_stat_read(p, io_ticks)), jiffies_to_msecs(part_stat_read(p, time_in_queue)), part_stat_read(p, ios[STAT_DISCARD]), part_stat_read(p, merges[STAT_DISCARD]), (unsigned long long)part_stat_read(p, sectors[STAT_DISCARD]), - jiffies_to_msecs(part_stat_read(p, ticks[STAT_DISCARD]))); + (unsigned int)part_stat_read_msecs(p, STAT_DISCARD)); } ssize_t part_inflight_show(struct device *dev, struct device_attribute *attr, diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 57864422a2c8..25c08c6c7f99 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -83,10 +83,10 @@ struct partition { } __attribute__((packed)); struct disk_stats { + u64 nsecs[NR_STAT_GROUPS]; unsigned long sectors[NR_STAT_GROUPS]; unsigned long ios[NR_STAT_GROUPS]; unsigned long merges[NR_STAT_GROUPS]; - unsigned long ticks[NR_STAT_GROUPS]; unsigned long io_ticks; unsigned long time_in_queue; }; @@ -354,6 +354,9 @@ static inline void free_part_stats(struct hd_struct *part) #endif /* CONFIG_SMP */ +#define part_stat_read_msecs(part, which) \ + div_u64(part_stat_read(part, nsecs[which]), NSEC_PER_MSEC) + #define part_stat_read_accum(part, field) \ (part_stat_read(part, field[STAT_READ]) + \ part_stat_read(part, field[STAT_WRITE]) + \ -- 2.19.0

6 years, 7 months

2
2
0 0

[PATCH 0/2] KEYS: Revert and replace incorrect UAPI fix

by David Howells

Hi James, Here's a pair of fixes that need to go upstream asap, please: (1) Revert an incorrect fix to the keyrings UAPI for a C++ reserved word used as a struct member name. This change being reverted breaks existing userspace code and is thus incorrect. Further, *neither* name is consistent with the one in the keyutils package public header. (2) Fix the problem by using a union to make the name from keyutils available in parallel and make the 'private' name unavailable in C++ with cpp-conditionals. David --- David Howells (1): keys: Fix the use of the C++ keyword "private" in uapi/linux/keyctl.h Lubomir Rintel (1): Revert "uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name" include/uapi/linux/keyctl.h | 7 ++++++- security/keys/dh.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-)

6 years, 7 months

3
4
0 0

[PATCH AUTOSEL 3.18 01/13] KVM: PPC: Book3S HV: Don't truncate HPTE index in xlate function

by Sasha Levin

From: Paul Mackerras <paulus(a)ozlabs.org> [ Upstream commit 46dec40fb741f00f1864580130779aeeaf24fb3d ] This fixes a bug which causes guest virtual addresses to get translated to guest real addresses incorrectly when the guest is using the HPT MMU and has more than 256GB of RAM, or more specifically has a HPT larger than 2GB. This has showed up in testing as a failure of the host to emulate doorbell instructions correctly on POWER9 for HPT guests with more than 256GB of RAM. The bug is that the HPTE index in kvmppc_mmu_book3s_64_hv_xlate() is stored as an int, and in forming the HPTE address, the index gets shifted left 4 bits as an int before being signed-extended to 64 bits. The simple fix is to make the variable a long int, matching the return type of kvmppc_hv_find_lock_hpte(), which is what calculates the index. Fixes: 697d3899dcb4 ("KVM: PPC: Implement MMIO emulation support for Book3S HV guests") Signed-off-by: Paul Mackerras <paulus(a)ozlabs.org> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> --- arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c index d40770248b6a..191cc3eea0bf 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -449,7 +449,7 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr, unsigned long pp, key; unsigned long v, gr; __be64 *hptep; - int index; + long int index; int virtmode = vcpu->arch.shregs.msr & (data ? MSR_DR : MSR_IR); /* Get SLB entry */ -- 2.17.1

6 years, 7 months

1
12
0 0

[PATCH AUTOSEL 4.4 01/18] KVM: PPC: Book3S HV: Don't truncate HPTE index in xlate function

by Sasha Levin

From: Paul Mackerras <paulus(a)ozlabs.org> [ Upstream commit 46dec40fb741f00f1864580130779aeeaf24fb3d ] This fixes a bug which causes guest virtual addresses to get translated to guest real addresses incorrectly when the guest is using the HPT MMU and has more than 256GB of RAM, or more specifically has a HPT larger than 2GB. This has showed up in testing as a failure of the host to emulate doorbell instructions correctly on POWER9 for HPT guests with more than 256GB of RAM. The bug is that the HPTE index in kvmppc_mmu_book3s_64_hv_xlate() is stored as an int, and in forming the HPTE address, the index gets shifted left 4 bits as an int before being signed-extended to 64 bits. The simple fix is to make the variable a long int, matching the return type of kvmppc_hv_find_lock_hpte(), which is what calculates the index. Fixes: 697d3899dcb4 ("KVM: PPC: Implement MMIO emulation support for Book3S HV guests") Signed-off-by: Paul Mackerras <paulus(a)ozlabs.org> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> --- arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c index fb37290a57b4..366965ae37bd 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -314,7 +314,7 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr, unsigned long pp, key; unsigned long v, gr; __be64 *hptep; - int index; + long int index; int virtmode = vcpu->arch.shregs.msr & (data ? MSR_DR : MSR_IR); /* Get SLB entry */ -- 2.17.1

6 years, 7 months

1
17
0 0

[PATCH AUTOSEL 4.9 01/23] mac80211: Run TXQ teardown code before de-registering interfaces

by Sasha Levin

From: Toke Høiland-Jørgensen <toke(a)toke.dk> [ Upstream commit 77cfaf52eca5cac30ed029507e0cab065f888995 ] The TXQ teardown code can reference the vif data structures that are stored in the netdev private memory area if there are still packets on the queue when it is being freed. Since the TXQ teardown code is run after the netdevs are freed, this can lead to a use-after-free. Fix this by moving the TXQ teardown code to earlier in ieee80211_unregister_hw(). Reported-by: Ben Greear <greearb(a)candelatech.com> Tested-by: Ben Greear <greearb(a)candelatech.com> Signed-off-by: Toke Høiland-Jørgensen <toke(a)toke.dk> Signed-off-by: Johannes Berg <johannes.berg(a)intel.com> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> --- net/mac80211/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 2bb6899854d4..6389ce868668 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1164,6 +1164,7 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw) #if IS_ENABLED(CONFIG_IPV6) unregister_inet6addr_notifier(&local->ifa6_notifier); #endif + ieee80211_txq_teardown_flows(local); rtnl_lock(); @@ -1191,7 +1192,6 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw) skb_queue_purge(&local->skb_queue); skb_queue_purge(&local->skb_queue_unreliable); skb_queue_purge(&local->skb_queue_tdls_chsw); - ieee80211_txq_teardown_flows(local); destroy_workqueue(local->workqueue); wiphy_unregister(local->hw.wiphy); -- 2.17.1

6 years, 7 months

1
22
0 0

[PATCH AUTOSEL 4.14 01/36] mac80211: Run TXQ teardown code before de-registering interfaces

by Sasha Levin

From: Toke Høiland-Jørgensen <toke(a)toke.dk> [ Upstream commit 77cfaf52eca5cac30ed029507e0cab065f888995 ] The TXQ teardown code can reference the vif data structures that are stored in the netdev private memory area if there are still packets on the queue when it is being freed. Since the TXQ teardown code is run after the netdevs are freed, this can lead to a use-after-free. Fix this by moving the TXQ teardown code to earlier in ieee80211_unregister_hw(). Reported-by: Ben Greear <greearb(a)candelatech.com> Tested-by: Ben Greear <greearb(a)candelatech.com> Signed-off-by: Toke Høiland-Jørgensen <toke(a)toke.dk> Signed-off-by: Johannes Berg <johannes.berg(a)intel.com> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> --- net/mac80211/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 8aa1f5b6a051..cb5b22b61388 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1171,6 +1171,7 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw) #if IS_ENABLED(CONFIG_IPV6) unregister_inet6addr_notifier(&local->ifa6_notifier); #endif + ieee80211_txq_teardown_flows(local); rtnl_lock(); @@ -1199,7 +1200,6 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw) skb_queue_purge(&local->skb_queue); skb_queue_purge(&local->skb_queue_unreliable); skb_queue_purge(&local->skb_queue_tdls_chsw); - ieee80211_txq_teardown_flows(local); destroy_workqueue(local->workqueue); wiphy_unregister(local->hw.wiphy); -- 2.17.1

6 years, 7 months

1
35
0 0

[PATCH AUTOSEL 4.18 01/76] mac80211: Run TXQ teardown code before de-registering interfaces

by Sasha Levin

From: Toke Høiland-Jørgensen <toke(a)toke.dk> [ Upstream commit 77cfaf52eca5cac30ed029507e0cab065f888995 ] The TXQ teardown code can reference the vif data structures that are stored in the netdev private memory area if there are still packets on the queue when it is being freed. Since the TXQ teardown code is run after the netdevs are freed, this can lead to a use-after-free. Fix this by moving the TXQ teardown code to earlier in ieee80211_unregister_hw(). Reported-by: Ben Greear <greearb(a)candelatech.com> Tested-by: Ben Greear <greearb(a)candelatech.com> Signed-off-by: Toke Høiland-Jørgensen <toke(a)toke.dk> Signed-off-by: Johannes Berg <johannes.berg(a)intel.com> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> --- net/mac80211/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/main.c b/net/mac80211/main.c index fb73451ed85e..0358f20b675f 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1182,6 +1182,7 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw) #if IS_ENABLED(CONFIG_IPV6) unregister_inet6addr_notifier(&local->ifa6_notifier); #endif + ieee80211_txq_teardown_flows(local); rtnl_lock(); @@ -1210,7 +1211,6 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw) skb_queue_purge(&local->skb_queue); skb_queue_purge(&local->skb_queue_unreliable); skb_queue_purge(&local->skb_queue_tdls_chsw); - ieee80211_txq_teardown_flows(local); destroy_workqueue(local->workqueue); wiphy_unregister(local->hw.wiphy); -- 2.17.1

6 years, 7 months

1
74
0 0

[git:media_tree/master] media: media colorspaces*.rst: rename AdobeRGB to opRGB

by Mauro Carvalho Chehab

This is an automatic generated email to let you know that the following patch were queued: Subject: media: media colorspaces*.rst: rename AdobeRGB to opRGB Author: Hans Verkuil <hansverk(a)cisco.com> Date: Thu Sep 13 07:47:28 2018 -0400 Drop all Adobe references and use the official opRGB standard instead. Signed-off-by: Hans Verkuil <hans.verkuil(a)cisco.com> Cc: stable(a)vger.kernel.org Acked-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> Documentation/media/uapi/v4l/biblio.rst | 10 ---------- Documentation/media/uapi/v4l/colorspaces-defs.rst | 8 ++++---- Documentation/media/uapi/v4l/colorspaces-details.rst | 13 ++++++------- 3 files changed, 10 insertions(+), 21 deletions(-) --- diff --git a/Documentation/media/uapi/v4l/biblio.rst b/Documentation/media/uapi/v4l/biblio.rst index 1cedcfc04327..386d6cf83e9c 100644 --- a/Documentation/media/uapi/v4l/biblio.rst +++ b/Documentation/media/uapi/v4l/biblio.rst @@ -226,16 +226,6 @@ xvYCC :author: International Electrotechnical Commission (http://www.iec.ch) -.. _adobergb: - -AdobeRGB -======== - - -:title: Adobe© RGB (1998) Color Image Encoding Version 2005-05 - -:author: Adobe Systems Incorporated (http://www.adobe.com) - .. _oprgb: opRGB diff --git a/Documentation/media/uapi/v4l/colorspaces-defs.rst b/Documentation/media/uapi/v4l/colorspaces-defs.rst index 410907fe9415..f24615544792 100644 --- a/Documentation/media/uapi/v4l/colorspaces-defs.rst +++ b/Documentation/media/uapi/v4l/colorspaces-defs.rst @@ -51,8 +51,8 @@ whole range, 0-255, dividing the angular value by 1.41. The enum - See :ref:`col-rec709`. * - ``V4L2_COLORSPACE_SRGB`` - See :ref:`col-srgb`. - * - ``V4L2_COLORSPACE_ADOBERGB`` - - See :ref:`col-adobergb`. + * - ``V4L2_COLORSPACE_OPRGB`` + - See :ref:`col-oprgb`. * - ``V4L2_COLORSPACE_BT2020`` - See :ref:`col-bt2020`. * - ``V4L2_COLORSPACE_DCI_P3`` @@ -90,8 +90,8 @@ whole range, 0-255, dividing the angular value by 1.41. The enum - Use the Rec. 709 transfer function. * - ``V4L2_XFER_FUNC_SRGB`` - Use the sRGB transfer function. - * - ``V4L2_XFER_FUNC_ADOBERGB`` - - Use the AdobeRGB transfer function. + * - ``V4L2_XFER_FUNC_OPRGB`` + - Use the opRGB transfer function. * - ``V4L2_XFER_FUNC_SMPTE240M`` - Use the SMPTE 240M transfer function. * - ``V4L2_XFER_FUNC_NONE`` diff --git a/Documentation/media/uapi/v4l/colorspaces-details.rst b/Documentation/media/uapi/v4l/colorspaces-details.rst index b5d551b9cc8f..09fabf4cd412 100644 --- a/Documentation/media/uapi/v4l/colorspaces-details.rst +++ b/Documentation/media/uapi/v4l/colorspaces-details.rst @@ -290,15 +290,14 @@ Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range 170M/BT.601. The Y'CbCr quantization is limited range. -.. _col-adobergb: +.. _col-oprgb: -Colorspace Adobe RGB (V4L2_COLORSPACE_ADOBERGB) +Colorspace opRGB (V4L2_COLORSPACE_OPRGB) =============================================== -The :ref:`adobergb` standard defines the colorspace used by computer -graphics that use the AdobeRGB colorspace. This is also known as the -:ref:`oprgb` standard. The default transfer function is -``V4L2_XFER_FUNC_ADOBERGB``. The default Y'CbCr encoding is +The :ref:`oprgb` standard defines the colorspace used by computer +graphics that use the opRGB colorspace. The default transfer function is +``V4L2_XFER_FUNC_OPRGB``. The default Y'CbCr encoding is ``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is limited range. @@ -312,7 +311,7 @@ The chromaticities of the primary colors and the white reference are: .. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}| -.. flat-table:: Adobe RGB Chromaticities +.. flat-table:: opRGB Chromaticities :header-rows: 1 :stub-columns: 0 :widths: 1 1 2

6 years, 7 months

1
0
0 0

[git:media_tree/master] media: hdmi.h: rename ADOBE_RGB to OPRGB and ADOBE_YCC to OPYCC

by Mauro Carvalho Chehab

This is an automatic generated email to let you know that the following patch were queued: Subject: media: hdmi.h: rename ADOBE_RGB to OPRGB and ADOBE_YCC to OPYCC Author: Hans Verkuil <hansverk(a)cisco.com> Date: Thu Sep 13 07:47:29 2018 -0400 These names have been renamed in the CTA-861 standard due to trademark issues. Replace them here as well so they are in sync with the standard. Signed-off-by: Hans Verkuil <hansverk(a)cisco.com> Cc: stable(a)vger.kernel.org Acked-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> drivers/media/i2c/adv7511.c | 4 ++-- drivers/media/v4l2-core/v4l2-dv-timings.c | 4 ++-- drivers/video/hdmi.c | 8 ++++---- include/linux/hdmi.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) --- diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c index a1f73d998495..f3899cc84e27 100644 --- a/drivers/media/i2c/adv7511.c +++ b/drivers/media/i2c/adv7511.c @@ -1357,8 +1357,8 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd, switch (format->format.colorspace) { case V4L2_COLORSPACE_OPRGB: c = HDMI_COLORIMETRY_EXTENDED; - ec = y ? HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601 : - HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB; + ec = y ? HDMI_EXTENDED_COLORIMETRY_OPYCC_601 : + HDMI_EXTENDED_COLORIMETRY_OPRGB; break; case V4L2_COLORSPACE_SMPTE170M: c = y ? HDMI_COLORIMETRY_ITU_601 : HDMI_COLORIMETRY_NONE; diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c index 19aabd1fcd2b..4f23e939ead0 100644 --- a/drivers/media/v4l2-core/v4l2-dv-timings.c +++ b/drivers/media/v4l2-core/v4l2-dv-timings.c @@ -877,7 +877,7 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi, switch (avi->colorimetry) { case HDMI_COLORIMETRY_EXTENDED: switch (avi->extended_colorimetry) { - case HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB: + case HDMI_EXTENDED_COLORIMETRY_OPRGB: c.colorspace = V4L2_COLORSPACE_OPRGB; c.xfer_func = V4L2_XFER_FUNC_OPRGB; break; @@ -948,7 +948,7 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi, c.ycbcr_enc = V4L2_YCBCR_ENC_601; c.xfer_func = V4L2_XFER_FUNC_SRGB; break; - case HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601: + case HDMI_EXTENDED_COLORIMETRY_OPYCC_601: c.colorspace = V4L2_COLORSPACE_OPRGB; c.ycbcr_enc = V4L2_YCBCR_ENC_601; c.xfer_func = V4L2_XFER_FUNC_OPRGB; diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c index 38716eb50408..8a3e8f61b991 100644 --- a/drivers/video/hdmi.c +++ b/drivers/video/hdmi.c @@ -592,10 +592,10 @@ hdmi_extended_colorimetry_get_name(enum hdmi_extended_colorimetry ext_col) return "xvYCC 709"; case HDMI_EXTENDED_COLORIMETRY_S_YCC_601: return "sYCC 601"; - case HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601: - return "Adobe YCC 601"; - case HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB: - return "Adobe RGB"; + case HDMI_EXTENDED_COLORIMETRY_OPYCC_601: + return "opYCC 601"; + case HDMI_EXTENDED_COLORIMETRY_OPRGB: + return "opRGB"; case HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM: return "BT.2020 Constant Luminance"; case HDMI_EXTENDED_COLORIMETRY_BT2020: diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h index d271ff23984f..4f3febc0f971 100644 --- a/include/linux/hdmi.h +++ b/include/linux/hdmi.h @@ -101,8 +101,8 @@ enum hdmi_extended_colorimetry { HDMI_EXTENDED_COLORIMETRY_XV_YCC_601, HDMI_EXTENDED_COLORIMETRY_XV_YCC_709, HDMI_EXTENDED_COLORIMETRY_S_YCC_601, - HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601, - HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB, + HDMI_EXTENDED_COLORIMETRY_OPYCC_601, + HDMI_EXTENDED_COLORIMETRY_OPRGB, /* The following EC values are only defined in CEA-861-F. */ HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM,

6 years, 7 months

1
0
0 0

[PATCH] USB: serial: simple: add Motorola Tetra MTP6550 id

by Johan Hovold

Add device-id for the Motorola Tetra radio MTP6550. Bus 001 Device 004: ID 0cad:9012 Motorola CGISS Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.00 bDeviceClass 0 (Defined at Interface level) bDeviceSubClass 0 bDeviceProtocol 0 bMaxPacketSize0 64 idVendor 0x0cad Motorola CGISS idProduct 0x9012 bcdDevice 24.16 iManufacturer 1 Motorola Solutions, Inc. iProduct 2 TETRA PEI interface iSerial 0 bNumConfigurations 1 Configuration Descriptor: bLength 9 bDescriptorType 2 wTotalLength 55 bNumInterfaces 2 bConfigurationValue 1 iConfiguration 3 Generic Serial config bmAttributes 0x80 (Bus Powered) MaxPower 500mA Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 0 bAlternateSetting 0 bNumEndpoints 2 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 0 bInterfaceProtocol 0 iInterface 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x81 EP 1 IN bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x01 EP 1 OUT bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 0 bNumEndpoints 2 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 0 bInterfaceProtocol 0 iInterface 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x82 EP 2 IN bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x02 EP 2 OUT bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 0 Device Qualifier (for other device speed): bLength 10 bDescriptorType 6 bcdUSB 2.00 bDeviceClass 0 (Defined at Interface level) bDeviceSubClass 0 bDeviceProtocol 0 bMaxPacketSize0 64 bNumConfigurations 1 Device Status: 0x0000 (Bus Powered) Reported-by: Hans Hult <hanshult35(a)gmail.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/usb/serial/usb-serial-simple.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c index 40864c2bd9dc..4d0273508043 100644 --- a/drivers/usb/serial/usb-serial-simple.c +++ b/drivers/usb/serial/usb-serial-simple.c @@ -84,7 +84,8 @@ DEVICE(moto_modem, MOTO_IDS); /* Motorola Tetra driver */ #define MOTOROLA_TETRA_IDS() \ - { USB_DEVICE(0x0cad, 0x9011) } /* Motorola Solutions TETRA PEI */ + { USB_DEVICE(0x0cad, 0x9011) }, /* Motorola Solutions TETRA PEI */ \ + { USB_DEVICE(0x0cad, 0x9012) } /* MTP6550 */ DEVICE(motorola_tetra, MOTOROLA_TETRA_IDS); /* Novatel Wireless GPS driver */ -- 2.19.0

6 years, 7 months

1
0
0 0

[git:media_tree/master] media: replace ADOBERGB by OPRGB

by Mauro Carvalho Chehab

This is an automatic generated email to let you know that the following patch were queued: Subject: media: replace ADOBERGB by OPRGB Author: Hans Verkuil <hverkuil(a)xs4all.nl> Date: Fri Sep 14 04:58:03 2018 -0400 The CTA-861 standards have been updated to refer to opRGB instead of AdobeRGB. The official standard is in fact named opRGB, so switch to that. The two old defines referring to ADOBERGB in the public API are put under #ifndef __KERNEL__ and a comment mentions that they are deprecated. Signed-off-by: Hans Verkuil <hans.verkuil(a)cisco.com> Cc: stable(a)vger.kernel.org Acked-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> Documentation/media/videodev2.h.rst.exceptions | 6 +- drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c | 262 ++++++++++++------------ drivers/media/i2c/adv7511.c | 2 +- drivers/media/i2c/adv7604.c | 2 +- drivers/media/i2c/tc358743.c | 4 +- drivers/media/platform/vivid/vivid-core.h | 2 +- drivers/media/platform/vivid/vivid-ctrls.c | 6 +- drivers/media/platform/vivid/vivid-vid-out.c | 2 +- drivers/media/v4l2-core/v4l2-dv-timings.c | 8 +- include/uapi/linux/videodev2.h | 23 ++- 10 files changed, 165 insertions(+), 152 deletions(-) --- diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions index 63fa131729c0..1f4340dd9a37 100644 --- a/Documentation/media/videodev2.h.rst.exceptions +++ b/Documentation/media/videodev2.h.rst.exceptions @@ -56,7 +56,8 @@ replace symbol V4L2_MEMORY_USERPTR :c:type:`v4l2_memory` # Documented enum v4l2_colorspace replace symbol V4L2_COLORSPACE_470_SYSTEM_BG :c:type:`v4l2_colorspace` replace symbol V4L2_COLORSPACE_470_SYSTEM_M :c:type:`v4l2_colorspace` -replace symbol V4L2_COLORSPACE_ADOBERGB :c:type:`v4l2_colorspace` +replace symbol V4L2_COLORSPACE_OPRGB :c:type:`v4l2_colorspace` +replace define V4L2_COLORSPACE_ADOBERGB :c:type:`v4l2_colorspace` replace symbol V4L2_COLORSPACE_BT2020 :c:type:`v4l2_colorspace` replace symbol V4L2_COLORSPACE_DCI_P3 :c:type:`v4l2_colorspace` replace symbol V4L2_COLORSPACE_DEFAULT :c:type:`v4l2_colorspace` @@ -69,7 +70,8 @@ replace symbol V4L2_COLORSPACE_SRGB :c:type:`v4l2_colorspace` # Documented enum v4l2_xfer_func replace symbol V4L2_XFER_FUNC_709 :c:type:`v4l2_xfer_func` -replace symbol V4L2_XFER_FUNC_ADOBERGB :c:type:`v4l2_xfer_func` +replace symbol V4L2_XFER_FUNC_OPRGB :c:type:`v4l2_xfer_func` +replace define V4L2_XFER_FUNC_ADOBERGB :c:type:`v4l2_xfer_func` replace symbol V4L2_XFER_FUNC_DCI_P3 :c:type:`v4l2_xfer_func` replace symbol V4L2_XFER_FUNC_DEFAULT :c:type:`v4l2_xfer_func` replace symbol V4L2_XFER_FUNC_NONE :c:type:`v4l2_xfer_func` diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c index 3a3dc23c560c..a4341205c197 100644 --- a/drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c +++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c @@ -602,14 +602,14 @@ const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFE [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_SRGB][5] = { 3138, 657, 810 }, [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_SRGB][6] = { 731, 680, 3048 }, [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_SRGB][7] = { 800, 799, 800 }, - [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_ADOBERGB][0] = { 3033, 3033, 3033 }, - [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_ADOBERGB][1] = { 3046, 3054, 886 }, - [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_ADOBERGB][2] = { 0, 3058, 3031 }, - [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_ADOBERGB][3] = { 360, 3079, 877 }, - [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_ADOBERGB][4] = { 3103, 587, 3027 }, - [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_ADOBERGB][5] = { 3116, 723, 861 }, - [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_ADOBERGB][6] = { 789, 744, 3025 }, - [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_ADOBERGB][7] = { 851, 851, 851 }, + [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_OPRGB][0] = { 3033, 3033, 3033 }, + [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_OPRGB][1] = { 3046, 3054, 886 }, + [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_OPRGB][2] = { 0, 3058, 3031 }, + [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_OPRGB][3] = { 360, 3079, 877 }, + [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_OPRGB][4] = { 3103, 587, 3027 }, + [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_OPRGB][5] = { 3116, 723, 861 }, + [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_OPRGB][6] = { 789, 744, 3025 }, + [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_OPRGB][7] = { 851, 851, 851 }, [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_SMPTE240M][0] = { 2926, 2926, 2926 }, [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_SMPTE240M][1] = { 2941, 2950, 546 }, [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_SMPTE240M][2] = { 0, 2954, 2924 }, @@ -658,14 +658,14 @@ const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFE [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_SRGB][5] = { 3138, 657, 810 }, [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_SRGB][6] = { 731, 680, 3048 }, [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_SRGB][7] = { 800, 799, 800 }, - [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_ADOBERGB][0] = { 3033, 3033, 3033 }, - [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_ADOBERGB][1] = { 3046, 3054, 886 }, - [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_ADOBERGB][2] = { 0, 3058, 3031 }, - [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_ADOBERGB][3] = { 360, 3079, 877 }, - [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_ADOBERGB][4] = { 3103, 587, 3027 }, - [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_ADOBERGB][5] = { 3116, 723, 861 }, - [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_ADOBERGB][6] = { 789, 744, 3025 }, - [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_ADOBERGB][7] = { 851, 851, 851 }, + [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_OPRGB][0] = { 3033, 3033, 3033 }, + [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_OPRGB][1] = { 3046, 3054, 886 }, + [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_OPRGB][2] = { 0, 3058, 3031 }, + [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_OPRGB][3] = { 360, 3079, 877 }, + [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_OPRGB][4] = { 3103, 587, 3027 }, + [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_OPRGB][5] = { 3116, 723, 861 }, + [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_OPRGB][6] = { 789, 744, 3025 }, + [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_OPRGB][7] = { 851, 851, 851 }, [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_SMPTE240M][0] = { 2926, 2926, 2926 }, [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_SMPTE240M][1] = { 2941, 2950, 546 }, [V4L2_COLORSPACE_SMPTE240M][V4L2_XFER_FUNC_SMPTE240M][2] = { 0, 2954, 2924 }, @@ -714,14 +714,14 @@ const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFE [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_SRGB][5] = { 3056, 800, 800 }, [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_SRGB][6] = { 800, 800, 3056 }, [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_SRGB][7] = { 800, 800, 800 }, - [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_ADOBERGB][0] = { 3033, 3033, 3033 }, - [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_ADOBERGB][1] = { 3033, 3033, 851 }, - [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_ADOBERGB][2] = { 851, 3033, 3033 }, - [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_ADOBERGB][3] = { 851, 3033, 851 }, - [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_ADOBERGB][4] = { 3033, 851, 3033 }, - [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_ADOBERGB][5] = { 3033, 851, 851 }, - [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_ADOBERGB][6] = { 851, 851, 3033 }, - [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_ADOBERGB][7] = { 851, 851, 851 }, + [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_OPRGB][0] = { 3033, 3033, 3033 }, + [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_OPRGB][1] = { 3033, 3033, 851 }, + [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_OPRGB][2] = { 851, 3033, 3033 }, + [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_OPRGB][3] = { 851, 3033, 851 }, + [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_OPRGB][4] = { 3033, 851, 3033 }, + [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_OPRGB][5] = { 3033, 851, 851 }, + [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_OPRGB][6] = { 851, 851, 3033 }, + [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_OPRGB][7] = { 851, 851, 851 }, [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_SMPTE240M][0] = { 2926, 2926, 2926 }, [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_SMPTE240M][1] = { 2926, 2926, 507 }, [V4L2_COLORSPACE_REC709][V4L2_XFER_FUNC_SMPTE240M][2] = { 507, 2926, 2926 }, @@ -770,14 +770,14 @@ const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFE [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_SRGB][5] = { 2599, 901, 909 }, [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_SRGB][6] = { 991, 0, 2966 }, [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_SRGB][7] = { 800, 799, 800 }, - [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_ADOBERGB][0] = { 3033, 3033, 3033 }, - [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_ADOBERGB][1] = { 2989, 3120, 1180 }, - [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_ADOBERGB][2] = { 1913, 3011, 3009 }, - [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_ADOBERGB][3] = { 1836, 3099, 1105 }, - [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_ADOBERGB][4] = { 2627, 413, 2966 }, - [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_ADOBERGB][5] = { 2576, 943, 951 }, - [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_ADOBERGB][6] = { 1026, 0, 2942 }, - [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_ADOBERGB][7] = { 851, 851, 851 }, + [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_OPRGB][0] = { 3033, 3033, 3033 }, + [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_OPRGB][1] = { 2989, 3120, 1180 }, + [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_OPRGB][2] = { 1913, 3011, 3009 }, + [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_OPRGB][3] = { 1836, 3099, 1105 }, + [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_OPRGB][4] = { 2627, 413, 2966 }, + [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_OPRGB][5] = { 2576, 943, 951 }, + [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_OPRGB][6] = { 1026, 0, 2942 }, + [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_OPRGB][7] = { 851, 851, 851 }, [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_SMPTE240M][0] = { 2926, 2926, 2926 }, [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_SMPTE240M][1] = { 2879, 3022, 874 }, [V4L2_COLORSPACE_470_SYSTEM_M][V4L2_XFER_FUNC_SMPTE240M][2] = { 1688, 2903, 2901 }, @@ -826,14 +826,14 @@ const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFE [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_SRGB][5] = { 3001, 800, 799 }, [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_SRGB][6] = { 800, 800, 3071 }, [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_SRGB][7] = { 800, 800, 799 }, - [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_ADOBERGB][0] = { 3033, 3033, 3033 }, - [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_ADOBERGB][1] = { 3033, 3033, 776 }, - [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_ADOBERGB][2] = { 1068, 3033, 3033 }, - [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_ADOBERGB][3] = { 1068, 3033, 776 }, - [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_ADOBERGB][4] = { 2977, 851, 3048 }, - [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_ADOBERGB][5] = { 2977, 851, 851 }, - [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_ADOBERGB][6] = { 851, 851, 3048 }, - [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_ADOBERGB][7] = { 851, 851, 851 }, + [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_OPRGB][0] = { 3033, 3033, 3033 }, + [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_OPRGB][1] = { 3033, 3033, 776 }, + [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_OPRGB][2] = { 1068, 3033, 3033 }, + [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_OPRGB][3] = { 1068, 3033, 776 }, + [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_OPRGB][4] = { 2977, 851, 3048 }, + [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_OPRGB][5] = { 2977, 851, 851 }, + [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_OPRGB][6] = { 851, 851, 3048 }, + [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_OPRGB][7] = { 851, 851, 851 }, [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_SMPTE240M][0] = { 2926, 2926, 2926 }, [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_SMPTE240M][1] = { 2926, 2926, 423 }, [V4L2_COLORSPACE_470_SYSTEM_BG][V4L2_XFER_FUNC_SMPTE240M][2] = { 749, 2926, 2926 }, @@ -882,14 +882,14 @@ const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFE [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_SRGB][5] = { 3056, 800, 800 }, [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_SRGB][6] = { 800, 800, 3056 }, [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_SRGB][7] = { 800, 800, 800 }, - [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_ADOBERGB][0] = { 3033, 3033, 3033 }, - [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_ADOBERGB][1] = { 3033, 3033, 851 }, - [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_ADOBERGB][2] = { 851, 3033, 3033 }, - [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_ADOBERGB][3] = { 851, 3033, 851 }, - [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_ADOBERGB][4] = { 3033, 851, 3033 }, - [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_ADOBERGB][5] = { 3033, 851, 851 }, - [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_ADOBERGB][6] = { 851, 851, 3033 }, - [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_ADOBERGB][7] = { 851, 851, 851 }, + [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_OPRGB][0] = { 3033, 3033, 3033 }, + [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_OPRGB][1] = { 3033, 3033, 851 }, + [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_OPRGB][2] = { 851, 3033, 3033 }, + [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_OPRGB][3] = { 851, 3033, 851 }, + [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_OPRGB][4] = { 3033, 851, 3033 }, + [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_OPRGB][5] = { 3033, 851, 851 }, + [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_OPRGB][6] = { 851, 851, 3033 }, + [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_OPRGB][7] = { 851, 851, 851 }, [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_SMPTE240M][0] = { 2926, 2926, 2926 }, [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_SMPTE240M][1] = { 2926, 2926, 507 }, [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_SMPTE240M][2] = { 507, 2926, 2926 }, @@ -922,62 +922,62 @@ const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFE [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_SMPTE2084][5] = { 1812, 886, 886 }, [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_SMPTE2084][6] = { 886, 886, 1812 }, [V4L2_COLORSPACE_SRGB][V4L2_XFER_FUNC_SMPTE2084][7] = { 886, 886, 886 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_709][0] = { 2939, 2939, 2939 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_709][1] = { 2939, 2939, 781 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_709][2] = { 1622, 2939, 2939 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_709][3] = { 1622, 2939, 781 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_709][4] = { 2502, 547, 2881 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_709][5] = { 2502, 547, 547 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_709][6] = { 547, 547, 2881 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_709][7] = { 547, 547, 547 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SRGB][0] = { 3056, 3056, 3056 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SRGB][1] = { 3056, 3056, 1031 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SRGB][2] = { 1838, 3056, 3056 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SRGB][3] = { 1838, 3056, 1031 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SRGB][4] = { 2657, 800, 3002 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SRGB][5] = { 2657, 800, 800 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SRGB][6] = { 800, 800, 3002 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SRGB][7] = { 800, 800, 800 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_ADOBERGB][0] = { 3033, 3033, 3033 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_ADOBERGB][1] = { 3033, 3033, 1063 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_ADOBERGB][2] = { 1828, 3033, 3033 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_ADOBERGB][3] = { 1828, 3033, 1063 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_ADOBERGB][4] = { 2633, 851, 2979 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_ADOBERGB][5] = { 2633, 851, 851 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_ADOBERGB][6] = { 851, 851, 2979 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_ADOBERGB][7] = { 851, 851, 851 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE240M][0] = { 2926, 2926, 2926 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE240M][1] = { 2926, 2926, 744 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE240M][2] = { 1594, 2926, 2926 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE240M][3] = { 1594, 2926, 744 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE240M][4] = { 2484, 507, 2867 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE240M][5] = { 2484, 507, 507 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE240M][6] = { 507, 507, 2867 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE240M][7] = { 507, 507, 507 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_NONE][0] = { 2125, 2125, 2125 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_NONE][1] = { 2125, 2125, 212 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_NONE][2] = { 698, 2125, 2125 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_NONE][3] = { 698, 2125, 212 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_NONE][4] = { 1557, 130, 2043 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_NONE][5] = { 1557, 130, 130 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_NONE][6] = { 130, 130, 2043 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_NONE][7] = { 130, 130, 130 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_DCI_P3][0] = { 3175, 3175, 3175 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_DCI_P3][1] = { 3175, 3175, 1308 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_DCI_P3][2] = { 2069, 3175, 3175 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_DCI_P3][3] = { 2069, 3175, 1308 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_DCI_P3][4] = { 2816, 1084, 3127 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_DCI_P3][5] = { 2816, 1084, 1084 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_DCI_P3][6] = { 1084, 1084, 3127 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_DCI_P3][7] = { 1084, 1084, 1084 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE2084][0] = { 1812, 1812, 1812 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE2084][1] = { 1812, 1812, 1022 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE2084][2] = { 1402, 1812, 1812 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE2084][3] = { 1402, 1812, 1022 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE2084][4] = { 1692, 886, 1797 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE2084][5] = { 1692, 886, 886 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE2084][6] = { 886, 886, 1797 }, - [V4L2_COLORSPACE_ADOBERGB][V4L2_XFER_FUNC_SMPTE2084][7] = { 886, 886, 886 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_709][0] = { 2939, 2939, 2939 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_709][1] = { 2939, 2939, 781 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_709][2] = { 1622, 2939, 2939 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_709][3] = { 1622, 2939, 781 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_709][4] = { 2502, 547, 2881 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_709][5] = { 2502, 547, 547 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_709][6] = { 547, 547, 2881 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_709][7] = { 547, 547, 547 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SRGB][0] = { 3056, 3056, 3056 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SRGB][1] = { 3056, 3056, 1031 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SRGB][2] = { 1838, 3056, 3056 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SRGB][3] = { 1838, 3056, 1031 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SRGB][4] = { 2657, 800, 3002 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SRGB][5] = { 2657, 800, 800 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SRGB][6] = { 800, 800, 3002 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SRGB][7] = { 800, 800, 800 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_OPRGB][0] = { 3033, 3033, 3033 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_OPRGB][1] = { 3033, 3033, 1063 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_OPRGB][2] = { 1828, 3033, 3033 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_OPRGB][3] = { 1828, 3033, 1063 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_OPRGB][4] = { 2633, 851, 2979 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_OPRGB][5] = { 2633, 851, 851 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_OPRGB][6] = { 851, 851, 2979 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_OPRGB][7] = { 851, 851, 851 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE240M][0] = { 2926, 2926, 2926 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE240M][1] = { 2926, 2926, 744 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE240M][2] = { 1594, 2926, 2926 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE240M][3] = { 1594, 2926, 744 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE240M][4] = { 2484, 507, 2867 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE240M][5] = { 2484, 507, 507 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE240M][6] = { 507, 507, 2867 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE240M][7] = { 507, 507, 507 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_NONE][0] = { 2125, 2125, 2125 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_NONE][1] = { 2125, 2125, 212 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_NONE][2] = { 698, 2125, 2125 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_NONE][3] = { 698, 2125, 212 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_NONE][4] = { 1557, 130, 2043 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_NONE][5] = { 1557, 130, 130 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_NONE][6] = { 130, 130, 2043 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_NONE][7] = { 130, 130, 130 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_DCI_P3][0] = { 3175, 3175, 3175 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_DCI_P3][1] = { 3175, 3175, 1308 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_DCI_P3][2] = { 2069, 3175, 3175 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_DCI_P3][3] = { 2069, 3175, 1308 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_DCI_P3][4] = { 2816, 1084, 3127 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_DCI_P3][5] = { 2816, 1084, 1084 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_DCI_P3][6] = { 1084, 1084, 3127 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_DCI_P3][7] = { 1084, 1084, 1084 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE2084][0] = { 1812, 1812, 1812 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE2084][1] = { 1812, 1812, 1022 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE2084][2] = { 1402, 1812, 1812 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE2084][3] = { 1402, 1812, 1022 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE2084][4] = { 1692, 886, 1797 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE2084][5] = { 1692, 886, 886 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE2084][6] = { 886, 886, 1797 }, + [V4L2_COLORSPACE_OPRGB][V4L2_XFER_FUNC_SMPTE2084][7] = { 886, 886, 886 }, [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_709][0] = { 2939, 2939, 2939 }, [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_709][1] = { 2877, 2923, 1058 }, [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_709][2] = { 1837, 2840, 2916 }, @@ -994,14 +994,14 @@ const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFE [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_SRGB][5] = { 2517, 1159, 900 }, [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_SRGB][6] = { 1042, 870, 2917 }, [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_SRGB][7] = { 800, 800, 800 }, - [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_ADOBERGB][0] = { 3033, 3033, 3033 }, - [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_ADOBERGB][1] = { 2976, 3018, 1315 }, - [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_ADOBERGB][2] = { 2024, 2942, 3011 }, - [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_ADOBERGB][3] = { 1930, 2926, 1256 }, - [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_ADOBERGB][4] = { 2563, 1227, 2916 }, - [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_ADOBERGB][5] = { 2494, 1183, 943 }, - [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_ADOBERGB][6] = { 1073, 916, 2894 }, - [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_ADOBERGB][7] = { 851, 851, 851 }, + [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_OPRGB][0] = { 3033, 3033, 3033 }, + [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_OPRGB][1] = { 2976, 3018, 1315 }, + [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_OPRGB][2] = { 2024, 2942, 3011 }, + [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_OPRGB][3] = { 1930, 2926, 1256 }, + [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_OPRGB][4] = { 2563, 1227, 2916 }, + [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_OPRGB][5] = { 2494, 1183, 943 }, + [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_OPRGB][6] = { 1073, 916, 2894 }, + [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_OPRGB][7] = { 851, 851, 851 }, [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_SMPTE240M][0] = { 2926, 2926, 2926 }, [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_SMPTE240M][1] = { 2864, 2910, 1024 }, [V4L2_COLORSPACE_BT2020][V4L2_XFER_FUNC_SMPTE240M][2] = { 1811, 2826, 2903 }, @@ -1050,14 +1050,14 @@ const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFE [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_SRGB][5] = { 2880, 998, 902 }, [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_SRGB][6] = { 816, 823, 2940 }, [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_SRGB][7] = { 800, 800, 799 }, - [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_ADOBERGB][0] = { 3033, 3033, 3033 }, - [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_ADOBERGB][1] = { 3029, 3028, 1255 }, - [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_ADOBERGB][2] = { 1406, 2988, 3011 }, - [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_ADOBERGB][3] = { 1398, 2983, 1190 }, - [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_ADOBERGB][4] = { 2860, 1050, 2939 }, - [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_ADOBERGB][5] = { 2857, 1033, 945 }, - [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_ADOBERGB][6] = { 866, 873, 2916 }, - [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_ADOBERGB][7] = { 851, 851, 851 }, + [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_OPRGB][0] = { 3033, 3033, 3033 }, + [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_OPRGB][1] = { 3029, 3028, 1255 }, + [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_OPRGB][2] = { 1406, 2988, 3011 }, + [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_OPRGB][3] = { 1398, 2983, 1190 }, + [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_OPRGB][4] = { 2860, 1050, 2939 }, + [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_OPRGB][5] = { 2857, 1033, 945 }, + [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_OPRGB][6] = { 866, 873, 2916 }, + [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_OPRGB][7] = { 851, 851, 851 }, [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_SMPTE240M][0] = { 2926, 2926, 2926 }, [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_SMPTE240M][1] = { 2923, 2921, 957 }, [V4L2_COLORSPACE_DCI_P3][V4L2_XFER_FUNC_SMPTE240M][2] = { 1125, 2877, 2902 }, @@ -1128,7 +1128,7 @@ static const double rec709_to_240m[3][3] = { { 0.0016327, 0.0044133, 0.9939540 }, }; -static const double rec709_to_adobergb[3][3] = { +static const double rec709_to_oprgb[3][3] = { { 0.7151627, 0.2848373, -0.0000000 }, { 0.0000000, 1.0000000, 0.0000000 }, { -0.0000000, 0.0411705, 0.9588295 }, @@ -1195,7 +1195,7 @@ static double transfer_rec709_to_rgb(double v) return (v < 0.081) ? v / 4.5 : pow((v + 0.099) / 1.099, 1.0 / 0.45); } -static double transfer_rgb_to_adobergb(double v) +static double transfer_rgb_to_oprgb(double v) { return pow(v, 1.0 / 2.19921875); } @@ -1251,8 +1251,8 @@ static void csc(enum v4l2_colorspace colorspace, enum v4l2_xfer_func xfer_func, case V4L2_COLORSPACE_470_SYSTEM_M: mult_matrix(r, g, b, rec709_to_ntsc1953); break; - case V4L2_COLORSPACE_ADOBERGB: - mult_matrix(r, g, b, rec709_to_adobergb); + case V4L2_COLORSPACE_OPRGB: + mult_matrix(r, g, b, rec709_to_oprgb); break; case V4L2_COLORSPACE_BT2020: mult_matrix(r, g, b, rec709_to_bt2020); @@ -1284,10 +1284,10 @@ static void csc(enum v4l2_colorspace colorspace, enum v4l2_xfer_func xfer_func, *g = transfer_rgb_to_srgb(*g); *b = transfer_rgb_to_srgb(*b); break; - case V4L2_XFER_FUNC_ADOBERGB: - *r = transfer_rgb_to_adobergb(*r); - *g = transfer_rgb_to_adobergb(*g); - *b = transfer_rgb_to_adobergb(*b); + case V4L2_XFER_FUNC_OPRGB: + *r = transfer_rgb_to_oprgb(*r); + *g = transfer_rgb_to_oprgb(*g); + *b = transfer_rgb_to_oprgb(*b); break; case V4L2_XFER_FUNC_DCI_P3: *r = transfer_rgb_to_dcip3(*r); @@ -1321,7 +1321,7 @@ int main(int argc, char **argv) V4L2_COLORSPACE_470_SYSTEM_BG, 0, V4L2_COLORSPACE_SRGB, - V4L2_COLORSPACE_ADOBERGB, + V4L2_COLORSPACE_OPRGB, V4L2_COLORSPACE_BT2020, 0, V4L2_COLORSPACE_DCI_P3, @@ -1336,7 +1336,7 @@ int main(int argc, char **argv) "V4L2_COLORSPACE_470_SYSTEM_BG", "", "V4L2_COLORSPACE_SRGB", - "V4L2_COLORSPACE_ADOBERGB", + "V4L2_COLORSPACE_OPRGB", "V4L2_COLORSPACE_BT2020", "", "V4L2_COLORSPACE_DCI_P3", @@ -1345,7 +1345,7 @@ int main(int argc, char **argv) "", "V4L2_XFER_FUNC_709", "V4L2_XFER_FUNC_SRGB", - "V4L2_XFER_FUNC_ADOBERGB", + "V4L2_XFER_FUNC_OPRGB", "V4L2_XFER_FUNC_SMPTE240M", "V4L2_XFER_FUNC_NONE", "V4L2_XFER_FUNC_DCI_P3", diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c index 55c2ea0720d9..a1f73d998495 100644 --- a/drivers/media/i2c/adv7511.c +++ b/drivers/media/i2c/adv7511.c @@ -1355,7 +1355,7 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd, state->xfer_func = format->format.xfer_func; switch (format->format.colorspace) { - case V4L2_COLORSPACE_ADOBERGB: + case V4L2_COLORSPACE_OPRGB: c = HDMI_COLORIMETRY_EXTENDED; ec = y ? HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601 : HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB; diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c index c31673fcd5c1..070fdf65b714 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c @@ -2474,7 +2474,7 @@ static int adv76xx_log_status(struct v4l2_subdev *sd) "YCbCr Bt.601 (16-235)", "YCbCr Bt.709 (16-235)", "xvYCC Bt.601", "xvYCC Bt.709", "YCbCr Bt.601 (0-255)", "YCbCr Bt.709 (0-255)", - "sYCC", "Adobe YCC 601", "AdobeRGB", "invalid", "invalid", + "sYCC", "opYCC 601", "opRGB", "invalid", "invalid", "invalid", "invalid", "invalid" }; static const char * const rgb_quantization_range_txt[] = { diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c index ef4dbac6bb58..74159153dfad 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -1243,9 +1243,9 @@ static int tc358743_log_status(struct v4l2_subdev *sd) u8 vi_status3 = i2c_rd8(sd, VI_STATUS3); const int deep_color_mode[4] = { 8, 10, 12, 16 }; static const char * const input_color_space[] = { - "RGB", "YCbCr 601", "Adobe RGB", "YCbCr 709", "NA (4)", + "RGB", "YCbCr 601", "opRGB", "YCbCr 709", "NA (4)", "xvYCC 601", "NA(6)", "xvYCC 709", "NA(8)", "sYCC601", - "NA(10)", "NA(11)", "NA(12)", "Adobe YCC 601"}; + "NA(10)", "NA(11)", "NA(12)", "opYCC 601"}; v4l2_info(sd, "-----Chip status-----\n"); v4l2_info(sd, "Chip ID: 0x%02x\n", diff --git a/drivers/media/platform/vivid/vivid-core.h b/drivers/media/platform/vivid/vivid-core.h index 477c80a4d44c..cd4c8230563c 100644 --- a/drivers/media/platform/vivid/vivid-core.h +++ b/drivers/media/platform/vivid/vivid-core.h @@ -111,7 +111,7 @@ enum vivid_colorspace { VIVID_CS_170M, VIVID_CS_709, VIVID_CS_SRGB, - VIVID_CS_ADOBERGB, + VIVID_CS_OPRGB, VIVID_CS_2020, VIVID_CS_DCI_P3, VIVID_CS_240M, diff --git a/drivers/media/platform/vivid/vivid-ctrls.c b/drivers/media/platform/vivid/vivid-ctrls.c index 5429193fbb91..999aa101b150 100644 --- a/drivers/media/platform/vivid/vivid-ctrls.c +++ b/drivers/media/platform/vivid/vivid-ctrls.c @@ -348,7 +348,7 @@ static int vivid_vid_cap_s_ctrl(struct v4l2_ctrl *ctrl) V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_REC709, V4L2_COLORSPACE_SRGB, - V4L2_COLORSPACE_ADOBERGB, + V4L2_COLORSPACE_OPRGB, V4L2_COLORSPACE_BT2020, V4L2_COLORSPACE_DCI_P3, V4L2_COLORSPACE_SMPTE240M, @@ -729,7 +729,7 @@ static const char * const vivid_ctrl_colorspace_strings[] = { "SMPTE 170M", "Rec. 709", "sRGB", - "AdobeRGB", + "opRGB", "BT.2020", "DCI-P3", "SMPTE 240M", @@ -752,7 +752,7 @@ static const char * const vivid_ctrl_xfer_func_strings[] = { "Default", "Rec. 709", "sRGB", - "AdobeRGB", + "opRGB", "SMPTE 240M", "None", "DCI-P3", diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c index 51fec66d8d45..50248e2176a0 100644 --- a/drivers/media/platform/vivid/vivid-vid-out.c +++ b/drivers/media/platform/vivid/vivid-vid-out.c @@ -413,7 +413,7 @@ int vivid_try_fmt_vid_out(struct file *file, void *priv, mp->colorspace = V4L2_COLORSPACE_SMPTE170M; } else if (mp->colorspace != V4L2_COLORSPACE_SMPTE170M && mp->colorspace != V4L2_COLORSPACE_REC709 && - mp->colorspace != V4L2_COLORSPACE_ADOBERGB && + mp->colorspace != V4L2_COLORSPACE_OPRGB && mp->colorspace != V4L2_COLORSPACE_BT2020 && mp->colorspace != V4L2_COLORSPACE_SRGB) { mp->colorspace = V4L2_COLORSPACE_REC709; diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c index b4e50c5509b7..19aabd1fcd2b 100644 --- a/drivers/media/v4l2-core/v4l2-dv-timings.c +++ b/drivers/media/v4l2-core/v4l2-dv-timings.c @@ -878,8 +878,8 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi, case HDMI_COLORIMETRY_EXTENDED: switch (avi->extended_colorimetry) { case HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB: - c.colorspace = V4L2_COLORSPACE_ADOBERGB; - c.xfer_func = V4L2_XFER_FUNC_ADOBERGB; + c.colorspace = V4L2_COLORSPACE_OPRGB; + c.xfer_func = V4L2_XFER_FUNC_OPRGB; break; case HDMI_EXTENDED_COLORIMETRY_BT2020: c.colorspace = V4L2_COLORSPACE_BT2020; @@ -949,9 +949,9 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi, c.xfer_func = V4L2_XFER_FUNC_SRGB; break; case HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601: - c.colorspace = V4L2_COLORSPACE_ADOBERGB; + c.colorspace = V4L2_COLORSPACE_OPRGB; c.ycbcr_enc = V4L2_YCBCR_ENC_601; - c.xfer_func = V4L2_XFER_FUNC_ADOBERGB; + c.xfer_func = V4L2_XFER_FUNC_OPRGB; break; case HDMI_EXTENDED_COLORIMETRY_BT2020: c.colorspace = V4L2_COLORSPACE_BT2020; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 184e4dbe8f9c..29729d580452 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -225,8 +225,8 @@ enum v4l2_colorspace { /* For RGB colorspaces such as produces by most webcams. */ V4L2_COLORSPACE_SRGB = 8, - /* AdobeRGB colorspace */ - V4L2_COLORSPACE_ADOBERGB = 9, + /* opRGB colorspace */ + V4L2_COLORSPACE_OPRGB = 9, /* BT.2020 colorspace, used for UHDTV. */ V4L2_COLORSPACE_BT2020 = 10, @@ -258,7 +258,7 @@ enum v4l2_xfer_func { * * V4L2_COLORSPACE_SRGB, V4L2_COLORSPACE_JPEG: V4L2_XFER_FUNC_SRGB * - * V4L2_COLORSPACE_ADOBERGB: V4L2_XFER_FUNC_ADOBERGB + * V4L2_COLORSPACE_OPRGB: V4L2_XFER_FUNC_OPRGB * * V4L2_COLORSPACE_SMPTE240M: V4L2_XFER_FUNC_SMPTE240M * @@ -269,7 +269,7 @@ enum v4l2_xfer_func { V4L2_XFER_FUNC_DEFAULT = 0, V4L2_XFER_FUNC_709 = 1, V4L2_XFER_FUNC_SRGB = 2, - V4L2_XFER_FUNC_ADOBERGB = 3, + V4L2_XFER_FUNC_OPRGB = 3, V4L2_XFER_FUNC_SMPTE240M = 4, V4L2_XFER_FUNC_NONE = 5, V4L2_XFER_FUNC_DCI_P3 = 6, @@ -281,7 +281,7 @@ enum v4l2_xfer_func { * This depends on the colorspace. */ #define V4L2_MAP_XFER_FUNC_DEFAULT(colsp) \ - ((colsp) == V4L2_COLORSPACE_ADOBERGB ? V4L2_XFER_FUNC_ADOBERGB : \ + ((colsp) == V4L2_COLORSPACE_OPRGB ? V4L2_XFER_FUNC_OPRGB : \ ((colsp) == V4L2_COLORSPACE_SMPTE240M ? V4L2_XFER_FUNC_SMPTE240M : \ ((colsp) == V4L2_COLORSPACE_DCI_P3 ? V4L2_XFER_FUNC_DCI_P3 : \ ((colsp) == V4L2_COLORSPACE_RAW ? V4L2_XFER_FUNC_NONE : \ @@ -295,7 +295,7 @@ enum v4l2_ycbcr_encoding { * * V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_470_SYSTEM_M, * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_SRGB, - * V4L2_COLORSPACE_ADOBERGB and V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601 + * V4L2_COLORSPACE_OPRGB and V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601 * * V4L2_COLORSPACE_REC709 and V4L2_COLORSPACE_DCI_P3: V4L2_YCBCR_ENC_709 * @@ -382,6 +382,17 @@ enum v4l2_quantization { (((is_rgb_or_hsv) || (colsp) == V4L2_COLORSPACE_JPEG) ? \ V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE)) +/* + * Deprecated names for opRGB colorspace (IEC 61966-2-5) + * + * WARNING: Please don't use these deprecated defines in your code, as + * there is a chance we have to remove them in the future. + */ +#ifndef __KERNEL__ +#define V4L2_COLORSPACE_ADOBERGB V4L2_COLORSPACE_OPRGB +#define V4L2_XFER_FUNC_ADOBERGB V4L2_XFER_FUNC_OPRGB +#endif + enum v4l2_priority { V4L2_PRIORITY_UNSET = 0, /* not initialized */ V4L2_PRIORITY_BACKGROUND = 1,

6 years, 7 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror September 2018