binfmt_elf: Respect error return from `regset->active'
Subsystems (3)
PATCH 1/11 binfmt_elf: Respect error return from `regset->active'
From: "Maciej W. Rozycki" <[email protected]>
[ Upstream commit 2f819db565e82e5f73cd42b39925098986693378 ]
The regset API documented in <linux/regset.h> defines -ENODEV as the result of the ->active' handler to be used where the feature requested is not available on the hardware found. However code handling core file note generation in fill_thread_core_info' interpretes any non-zero result from the `->active' handler as the regset requested being active. Consequently processing continues (and hopefully gracefully fails later on) rather than being abandoned right away for the regset requested.
Fix the problem then by making the code proceed only if a positive result is returned from the `->active' handler.
Patchwork: https://patchwork.linux-mips.org/patch/19332/
--- fs/binfmt_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/binfmt_elf.c +1 -1
@@ -1552,7 +1552,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,const struct user_regset *regset = &view->regsets[i];do_thread_regset_writeback (t->task, regset);if (regset->core_note_type && regset->get && - (!regset->active || regset->active (t->task, regset))) { + (!regset->active || regset->active (t->task, regset) >0 )) {int ret;size_t size = regset->n * regset->size;void *data =kmalloc (size,GFP_KERNEL );
Signature · 1 line
2.17.1
PATCH 2/11 audit: fix use-after-free in audit_add_watch
From: Ronny Chevalier <[email protected]>
[ Upstream commit baa2a4fdd525c8c4b0f704d20457195b29437839 ]
audit_add_watch stores locally krule->watch without taking a reference on watch. Then, it calls audit_add_to_parent, and uses the watch stored locally.
Unfortunately, it is possible that audit_add_to_parent updates krule->watch.
When it happens, it also drops a reference of watch which could free the watch.
How to reproduce (with KASAN enabled):
auditctl -w /etc/passwd -F success=0 -k test_passwd auditctl -w /etc/passwd -F success=1 -k test_passwd2
The second call to auditctl triggers the use-after-free, because audit_to_parent updates krule->watch to use a previous existing watch and drops the reference to the newly created watch.
To fix the issue, we grab a reference of watch and we release it at the end of the function.
--- kernel/audit_watch.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
kernel/audit_watch.c +11 -1
@@ -414,6 +414,13 @@ int audit_add_watch(struct audit_krule *krule, struct list_head **list)struct path parent_path;int h, ret =0 ; +/* +* When we will be calling audit_add_to_parent, krule->watch might have +* been updated and watch might have been freed. +* So we need to keep a reference of watch. +*/ +audit_get_watch (watch); +mutex_unlock (&audit_filter_mutex);/* Avoid calling path_lookup under audit_filter_mutex. */
@@ -422,8 +429,10 @@ int audit_add_watch(struct audit_krule *krule, struct list_head **list)/* caller expects mutex locked */ mutex_lock (&audit_filter_mutex); -if (ret) +if (ret) { +audit_put_watch (watch);return ret; + }/* either find an old parent or attach a new one */ parent =audit_find_parent (parent_path.dentry->d_inode);
@@ -444,6 +453,7 @@ int audit_add_watch(struct audit_krule *krule, struct list_head **list) *list = &audit_inode_hash[h]; error:path_put (&parent_path); +audit_put_watch (watch);return ret; }
Signature · 1 line
2.17.1
PATCH 3/11 mtdchar: fix overflows in adjustment of `count`
In reply to Sasha LevinFrom: Jann Horn <[email protected]>
[ Upstream commit 6c6bc9ea84d0008024606bf5ba10519e20d851bf ]
The first checks in mtdchar_read() and mtdchar_write() attempt to limit count such that *ppos + count <= mtd->size. However, they ignore the possibility of *ppos > mtd->size, allowing the calculation of count to wrap around. mtdchar_lseek() prevents seeking beyond mtd->size, but the pread/pwrite syscalls bypass this.
I haven't found any codepath on which this actually causes dangerous behavior, but it seems like a sensible change anyway.
--- drivers/mtd/mtdchar.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/mtd/mtdchar.c +7 -3
@@ -190,8 +190,12 @@ static ssize_t mtdchar_read(struct file *file, char __user *buf, size_t count,pr_debug ("MTD_read\n" ); -if (*ppos + count > mtd->size) - count = mtd->size - *ppos; +if (*ppos + count > mtd->size) { +if (*ppos < mtd->size) + count = mtd->size - *ppos; +else + count =0 ; + }if (!count)return 0 ;
@@ -276,7 +280,7 @@ static ssize_t mtdchar_write(struct file *file, const char __user *buf, size_t cpr_debug ("MTD_write\n" ); -if (*ppos == mtd->size) +if (*ppos >= mtd->size)return -ENOSPC ;if (*ppos + count > mtd->size)
Signature · 1 line
2.17.1
PATCH 4/11 MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads
In reply to Sasha LevinFrom: Paul Burton <[email protected]>
[ Upstream commit cd87668d601f622e0ebcfea4f78d116d5f572f4d ]
The PCI_OHCI_INT_REG case in pci_ohci_read_reg() contains the following if statement:
if ((lo & 0x00000f00) == CS5536_USB_INTR)
CS5536_USB_INTR expands to the constant 11, which gives us the following condition which can never evaluate true:
if ((lo & 0xf00) == 11)
At least when using GCC 8.1.0 this falls foul of the tautoligcal-compare warning, and since the code is built with the -Werror flag the build fails.
Fix this by shifting lo right by 8 bits in order to match the corresponding PCI_OHCI_INT_REG case in pci_ohci_write_reg().
Patchwork: https://patchwork.linux-mips.org/patch/19861/
--- arch/mips/loongson/common/cs5536/cs5536_ohci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/loongson/common/cs5536/cs5536_ohci.c +1 -1
@@ -138,7 +138,7 @@ u32 pci_ohci_read_reg(int reg)break ;case PCI_OHCI_INT_REG :_rdmsr (DIVIL_MSR_REG (PIC_YSEL_LOW ), &hi, &lo); -if ((lo &0x00000f00 ) ==CS5536_USB_INTR ) +if (((lo >>PIC_YSEL_LOW_USB_SHIFT ) &0xf ) ==CS5536_USB_INTR ) conf_data =1 ;break ;default :
Signature · 1 line
2.17.1
PATCH 5/11 ARM: hisi: handle of_iomap and fix missing of_node_put
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit d396cb185c0337aae5664b250cdd9a73f6eb1503 ]
Relying on an unchecked of_iomap() which can return NULL is problematic here, an explicit check seems mandatory. Also the call to of_find_compatible_node() returns a device node with refcount incremented therefor an explicit of_node_put() is needed here.
--- arch/arm/mach-hisi/hotplug.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
arch/arm/mach-hisi/hotplug.c +13 -6
@@ -145,13 +145,20 @@ static int hi3xxx_hotplug_init(void)struct device_node *node; node =of_find_compatible_node (NULL ,NULL ,"hisilicon,sysctrl" ); -if (node) { - ctrl_base =of_iomap (node,0 ); - id =HI3620_CTRL ; -return 0 ; +if (!node) { + id =ERROR_CTRL ; +return -ENOENT ; } - id =ERROR_CTRL ; -return -ENOENT ; + + ctrl_base =of_iomap (node,0 ); +of_node_put (node); +if (!ctrl_base) { + id =ERROR_CTRL ; +return -ENOMEM ; + } + + id =HI3620_CTRL ; +return 0 ; }void hi3xxx_set_cpu (int cpu,bool enable)
Signature · 1 line
2.17.1
PATCH 6/11 ARM: hisi: check of_iomap and fix missing of_node_put
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit 81646a3d39ef14749301374a3a0b8311384cd412 ]
of_find_compatible_node() returns a device node with refcount incremented and thus needs an explicit of_node_put(). Further relying on an unchecked of_iomap() which can return NULL is problematic here, after all ctrl_base is critical enough for hix5hd2_set_cpu() to call BUG() if not available so a check seems mandated here.
0002 Fixes: commit 06cc5c1d4d73 ("ARM: hisi: enable hix5hd2 SoC")
--- arch/arm/mach-hisi/hotplug.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
arch/arm/mach-hisi/hotplug.c +9 -5
@@ -177,11 +177,15 @@ static bool hix5hd2_hotplug_init(void)struct device_node *np; np =of_find_compatible_node (NULL ,NULL ,"hisilicon,cpuctrl" ); -if (np) { - ctrl_base =of_iomap (np,0 ); -return true; - } -return false; +if (!np) +return false; + + ctrl_base =of_iomap (np,0 ); +of_node_put (np); +if (!ctrl_base) +return false; + +return true; }void hix5hd2_set_cpu (int cpu,bool enable)
Signature · 1 line
2.17.1
PATCH 7/11 parport: sunbpp: fix error return code
In reply to Sasha LevinFrom: Julia Lawall <[email protected]>
[ Upstream commit faa1a47388b33623e4d504c23569188907b039a0 ]
Return an error code on failure. Change leading spaces to tab on the first if.
Problem found using Coccinelle.
--- drivers/parport/parport_sunbpp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/parport/parport_sunbpp.c +6 -2
@@ -286,12 +286,16 @@ static int bpp_probe(struct platform_device *op) ops =kmemdup (&parport_sunbpp_ops,sizeof (struct parport_operations ),GFP_KERNEL ); -if (!ops) +if (!ops) { + err = -ENOMEM ; goto out_unmap; + }dprintk (("register_port\n" )); -if (!(p =parport_register_port ((unsigned long )base, irq, dma, ops))) +if (!(p =parport_register_port ((unsigned long )base, irq, dma, ops))) { + err = -ENOMEM ; goto out_free_ops; + } p->size = size; p->dev = &op->dev;
Signature · 1 line
2.17.1
PATCH 8/11 rtc: bq4802: add error handling for devm_ioremap
In reply to Sasha LevinFrom: Zhouyang Jia <[email protected]>
[ Upstream commit 7874b919866ba91bac253fa219d3d4c82bb944df ]
When devm_ioremap fails, the lack of error-handling code may cause unexpected results.
This patch adds error-handling code after calling devm_ioremap.
--- drivers/rtc/rtc-bq4802.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/rtc/rtc-bq4802.c +4 -0
@@ -164,6 +164,10 @@ static int bq4802_probe(struct platform_device *pdev) }else if (p->r->flags &IORESOURCE_MEM ) { p->regs =devm_ioremap (&pdev->dev, p->r->start,resource_size (p->r)); +if (!p->regs){ + err = -ENOMEM ; + goto out; + } p->read = bq4802_read_mem; p->write = bq4802_write_mem; }else {
Signature · 1 line
2.17.1
PATCH 9/11 ALSA: pcm: Fix snd_interval_refine first/last with open min/max
In reply to Sasha LevinFrom: Timo Wischer <[email protected]>
[ Upstream commit ff2d6acdf6f13d9f8fdcd890844c6d7535ac1f10 ]
Without this commit the following intervals [x y), (x y) were be replaced to (y-1 y) by snd_interval_refine_last(). This was also done if y-1 is part of the previous interval.
With this changes it will be replaced with [y-1 y) in case of y-1 is part of the previous interval. A similar behavior will be used for snd_interval_refine_first().
This commit adapts the changes for alsa-lib of commit 9bb985c ("pcm: snd_interval_refine_first/last: exclude value only if also excluded before")
--- sound/core/pcm_lib.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
sound/core/pcm_lib.c +10 -4
@@ -714,27 +714,33 @@ EXPORT_SYMBOL(snd_interval_refine);static int snd_interval_refine_first (struct snd_interval *i) { +const unsigned int last_max = i->max; +if (snd_BUG_ON (snd_interval_empty (i)))return -EINVAL ;if (snd_interval_single (i))return 0 ; i->max = i->min; - i->openmax = i->openmin; -if (i->openmax) +if (i->openmin) i->max++; +/* only exclude max value if also excluded before refine */ + i->openmax = (i->openmax && i->max >= last_max);return 1 ; }static int snd_interval_refine_last (struct snd_interval *i) { +const unsigned int last_min = i->min; +if (snd_BUG_ON (snd_interval_empty (i)))return -EINVAL ;if (snd_interval_single (i))return 0 ; i->min = i->max; - i->openmin = i->openmax; -if (i->openmin) +if (i->openmax) i->min--; +/* only exclude min value if also excluded before refine */ + i->openmin = (i->openmin && i->min <= last_min);return 1 ; }
Signature · 1 line
2.17.1
PATCH 10/11 drm/panel: type promotion bug in s6e8aa0_read_mtp_id()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit cd0e0ca69109d025b1a1b6609f70682db62138b0 ]
The ARRAY_SIZE() macro is type size_t. If s6e8aa0_dcs_read() returns a negative error code, then "ret < ARRAY_SIZE(id)" is false because the negative error code is type promoted to a high positive value.
--- drivers/gpu/drm/panel/panel-s6e8aa0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-s6e8aa0.c +1 -1
@@ -835,7 +835,7 @@ static void s6e8aa0_read_mtp_id(struct s6e8aa0 *ctx)int ret, i; ret =s6e8aa0_dcs_read (ctx,0xd1 , id,ARRAY_SIZE (id)); -if (ret <ARRAY_SIZE (id) || id[0 ] ==0x00 ) { +if (ret <0 || ret <ARRAY_SIZE (id) || id[0 ] ==0x00 ) {dev_err (ctx->dev,"read id failed\n" ); ctx->error = -EIO ;return ;
Signature · 1 line
2.17.1
PATCH 11/11 IB/nes: Fix a compiler warning
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit 4c5743bc4fe3233cecc1c184a773c79c8ee45bbe ]
Avoid that the following compiler warning is reported when building with W=1:
drivers/infiniband/hw/nes/nes_hw.c:646:51: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
--- drivers/infiniband/hw/nes/nes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/nes/nes.h +1 -1
@@ -156,7 +156,7 @@ do { \#define NES_EVENT_TIMEOUT 1200000#else -#define nes_debug(level, fmt, args...) +#define nes_debug(level, fmt, args...) do {} while (0)#define assert (expr) do {} while (0)#define NES_EVENT_TIMEOUT 100000
Signature · 1 line
2.17.1