- Linux-stable-mirror - lists.linaro.org

v3.18.97 build: 0 failures 1 warnings (v3.18.97)

by Build bot for Mark Brown

Tree/Branch: v3.18.97 Git describe: v3.18.97 Commit: 43a69271f5 Linux 3.18.97 Build Time: 50 min 24 sec Passed: 9 / 9 (100.00 %) Failed: 0 / 9 ( 0.00 %) Errors: 0 Warnings: 1 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): 2 warnings 0 mismatches : x86_64-defconfig ------------------------------------------------------------------------------- Warnings Summary: 1 2 ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- x86_64-defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches Warnings: ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm64-allmodconfig arm-multi_v5_defconfig arm-multi_v7_defconfig arm-allmodconfig arm-allnoconfig x86_64-allnoconfig arm64-defconfig close failed in file object destructor: sys.excepthook is missing lost sys.stderr

7 years, 4 months

1
0
0 0

Applied "spi: atmel: init FIFOs before spi enable" to the spi tree

by Mark Brown

The patch spi: atmel: init FIFOs before spi enable has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 9581329eff9db72ab4fbb46a594fd7fdda3c51b0 Mon Sep 17 00:00:00 2001 From: Eugen Hristev <eugen.hristev(a)microchip.com> Date: Tue, 27 Feb 2018 12:25:07 +0200 Subject: [PATCH] spi: atmel: init FIFOs before spi enable The datasheet recommends initializing FIFOs before SPI enable. If we do not do it like this, there may be a strange behavior. We noticed that DMA does not work properly with FIFOs if we do not clear them beforehand or enable them before SPIEN. Signed-off-by: Eugen Hristev <eugen.hristev(a)microchip.com> Acked-by: Nicolas Ferre <nicolas.ferre(a)microchip.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> Cc: stable(a)vger.kernel.org --- drivers/spi/spi-atmel.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 4a11fc0d4136..b7936f815373 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1512,6 +1512,11 @@ static void atmel_spi_init(struct atmel_spi *as) { spi_writel(as, CR, SPI_BIT(SWRST)); spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */ + + /* It is recommended to enable FIFOs first thing after reset */ + if (as->fifo_size) + spi_writel(as, CR, SPI_BIT(FIFOEN)); + if (as->caps.has_wdrbt) { spi_writel(as, MR, SPI_BIT(WDRBT) | SPI_BIT(MODFDIS) | SPI_BIT(MSTR)); @@ -1522,9 +1527,6 @@ static void atmel_spi_init(struct atmel_spi *as) if (as->use_pdc) spi_writel(as, PTCR, SPI_BIT(RXTDIS) | SPI_BIT(TXTDIS)); spi_writel(as, CR, SPI_BIT(SPIEN)); - - if (as->fifo_size) - spi_writel(as, CR, SPI_BIT(FIFOEN)); } static int atmel_spi_probe(struct platform_device *pdev) -- 2.16.1

7 years, 4 months

1
0
0 0

Applied "ASoC: wm_adsp: For TLV controls only register TLV get/set" to the asoc tree

by Mark Brown

The patch ASoC: wm_adsp: For TLV controls only register TLV get/set has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From d7789f5bcdb298c4a302db471b1b20f74a20de95 Mon Sep 17 00:00:00 2001 From: Richard Fitzgerald <rf(a)opensource.cirrus.com> Date: Wed, 28 Feb 2018 10:31:10 +0000 Subject: [PATCH] ASoC: wm_adsp: For TLV controls only register TLV get/set Normal 512-byte get/set of a TLV isn't supported but we were registering the normal get/set anyway and relying on omitting the SNDRV_CTL_ELEM_ACCESS_[READ|WRITE] flags to prevent them being called. Trouble is if this gets broken in the core ALSA code - as it has been since at least 4.14 - the standard get/set can be called unexpectedly and corrupt memory. There's no point providing functions that won't be called and it's a trivial change. The benefit is that if the ALSA core gets broken again we get a big fat immediate NULL dereference instead of a memory corruption timebomb. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> Cc: stable(a)vger.kernel.org --- sound/soc/codecs/wm_adsp.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 66e32f5d2917..989d093abda7 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1204,12 +1204,14 @@ static int wmfw_add_ctl(struct wm_adsp *dsp, struct wm_coeff_ctl *ctl) kcontrol->put = wm_coeff_put_acked; break; default: - kcontrol->get = wm_coeff_get; - kcontrol->put = wm_coeff_put; - - ctl->bytes_ext.max = ctl->len; - ctl->bytes_ext.get = wm_coeff_tlv_get; - ctl->bytes_ext.put = wm_coeff_tlv_put; + if (kcontrol->access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) { + ctl->bytes_ext.max = ctl->len; + ctl->bytes_ext.get = wm_coeff_tlv_get; + ctl->bytes_ext.put = wm_coeff_tlv_put; + } else { + kcontrol->get = wm_coeff_get; + kcontrol->put = wm_coeff_put; + } break; } -- 2.16.1

7 years, 4 months

1
0
0 0

Re: [PATCH -stable] arm64: mm: don't write garbage into TTBR1_EL1 register

by Greg KH

On Fri, Feb 23, 2018 at 06:29:02PM +0000, Ard Biesheuvel wrote: > Stable backport commit 173358a49173 ("arm64: kpti: Add ->enable callback > to remap swapper using nG mappings") of upstream commit f992b4dfd58b did > not survive the backporting process unscathed, and ends up writing garbage > into the TTBR1_EL1 register, rather than pointing it to the zero page to > disable translations. Fix that. > > Cc: <stable(a)vger.kernel.org> #v4.14 > Reported-by: Nicolas Dechesne <nicolas.dechesne(a)linaro.org> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> > --- > arch/arm64/mm/proc.S | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Any reason why you didn't cc: the stable list, as this is a patch that is not needed in mainline, right? > diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S > index 08572f95bd8a..2b473ddeb7a3 100644 > --- a/arch/arm64/mm/proc.S > +++ b/arch/arm64/mm/proc.S > @@ -155,7 +155,7 @@ ENDPROC(cpu_do_switch_mm) > > .macro __idmap_cpu_set_reserved_ttbr1, tmp1, tmp2 > adrp \tmp1, empty_zero_page > - msr ttbr1_el1, \tmp2 > + msr ttbr1_el1, \tmp1 I don't understand why this isn't also needed in Linus's tree. What commit there prevents this from being required? thanks, greg k-h

7 years, 4 months

5
5
0 0

Re: Linux 3.18.97

by Greg KH

diff --git a/Makefile b/Makefile index aa45be375d8f..7781ca4f1ca2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 18 -SUBLEVEL = 96 +SUBLEVEL = 97 EXTRAVERSION = NAME = Diseased Newt diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 27a2637543ff..1a1436c481ef 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -45,7 +45,7 @@ static const char *handler[]= { "Error" }; -int show_unhandled_signals = 1; +int show_unhandled_signals = 0; /* * Dump out the contents of some memory nicely... diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 1d2e6392f5fa..f24bd7249536 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -471,7 +471,7 @@ static int nmi_setup(void) goto fail; for_each_possible_cpu(cpu) { - if (!cpu) + if (!IS_ENABLED(CONFIG_SMP) || !cpu) continue; memcpy(per_cpu(cpu_msrs, cpu).counters, diff --git a/drivers/iio/imu/adis_trigger.c b/drivers/iio/imu/adis_trigger.c index f53e9a803a0e..93b99bd93738 100644 --- a/drivers/iio/imu/adis_trigger.c +++ b/drivers/iio/imu/adis_trigger.c @@ -47,6 +47,10 @@ int adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev) if (adis->trig == NULL) return -ENOMEM; + adis->trig->dev.parent = &adis->spi->dev; + adis->trig->ops = &adis_trigger_ops; + iio_trigger_set_drvdata(adis->trig, adis); + ret = request_irq(adis->spi->irq, &iio_trigger_generic_data_rdy_poll, IRQF_TRIGGER_RISING, @@ -55,9 +59,6 @@ int adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev) if (ret) goto error_free_trig; - adis->trig->dev.parent = &adis->spi->dev; - adis->trig->ops = &adis_trigger_ops; - iio_trigger_set_drvdata(adis->trig, adis); ret = iio_trigger_register(adis->trig); indio_dev->trig = iio_trigger_get(adis->trig); diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 25c68de393ad..1f64457cc6ba 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -92,7 +92,7 @@ unsigned int iio_buffer_poll(struct file *filp, struct iio_dev *indio_dev = filp->private_data; struct iio_buffer *rb = indio_dev->buffer; - if (!indio_dev->info) + if (!indio_dev->info || rb == NULL) return 0; poll_wait(filp, &rb->pollq, wait); diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index ac897f051863..30b93dd1e612 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -503,7 +503,7 @@ static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq) * Ensure that stores to Normal memory are visible to the * other CPUs before issuing the IPI. */ - smp_wmb(); + wmb(); for_each_cpu_mask(cpu, *mask) { u64 cluster_id = cpu_logical_map(cpu) & ~0xffUL; diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c index 1b893bc8b842..1e934b7e0139 100644 --- a/drivers/pci/host/pci-keystone.c +++ b/drivers/pci/host/pci-keystone.c @@ -179,14 +179,16 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, } /* interrupt controller is in a child node */ - *np_temp = of_find_node_by_name(np_pcie, controller); + *np_temp = of_get_child_by_name(np_pcie, controller); if (!(*np_temp)) { dev_err(dev, "Node for %s is absent\n", controller); goto out; } temp = of_irq_count(*np_temp); - if (!temp) + if (!temp) { + of_node_put(*np_temp); goto out; + } if (temp > max_host_irqs) dev_warn(dev, "Too many %s interrupts defined %u\n", (legacy ? "legacy" : "MSI"), temp); @@ -200,6 +202,9 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, if (host_irqs[temp] < 0) break; } + + of_node_put(*np_temp); + if (temp) { *num_irqs = temp; ret = 0; diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h index 8fae03215a85..543c10266984 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.h +++ b/drivers/scsi/ibmvscsi/ibmvfc.h @@ -366,7 +366,7 @@ enum ibmvfc_fcp_rsp_info_codes { }; struct ibmvfc_fcp_rsp_info { - __be16 reserved; + u8 reserved[3]; u8 rsp_code; u8 reserved2[4]; }__attribute__((packed, aligned (2))); diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 6ce78e3ca7c6..a1ab83769191 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2345,6 +2345,8 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc) break; } + dwc->eps[1]->endpoint.maxpacket = dwc->gadget.ep0->maxpacket; + /* Enable USB2 LPM Capability */ if ((dwc->revision > DWC3_REVISION_194A) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 88aa287f10ea..62d2a8b41bc4 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -2727,10 +2727,8 @@ static int _ffs_func_bind(struct usb_configuration *c, struct ffs_data *ffs = func->ffs; const int full = !!func->ffs->fs_descs_count; - const int high = gadget_is_dualspeed(func->gadget) && - func->ffs->hs_descs_count; - const int super = gadget_is_superspeed(func->gadget) && - func->ffs->ss_descs_count; + const int high = !!func->ffs->hs_descs_count; + const int super = !!func->ffs->ss_descs_count; int fs_len, hs_len, ss_len, ret, i; diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c index 7f453b6ff0d0..c3a768ae1a40 100644 --- a/lib/asn1_decoder.c +++ b/lib/asn1_decoder.c @@ -305,38 +305,43 @@ next_op: /* Decide how to handle the operation */ switch (op) { - case ASN1_OP_MATCH_ANY_ACT: - case ASN1_OP_COND_MATCH_ANY_ACT: - ret = actions[machine[pc + 1]](context, hdr, tag, data + dp, len); - if (ret < 0) - return ret; - goto skip_data; - - case ASN1_OP_MATCH_ACT: - case ASN1_OP_MATCH_ACT_OR_SKIP: - case ASN1_OP_COND_MATCH_ACT_OR_SKIP: - ret = actions[machine[pc + 2]](context, hdr, tag, data + dp, len); - if (ret < 0) - return ret; - goto skip_data; - case ASN1_OP_MATCH: case ASN1_OP_MATCH_OR_SKIP: + case ASN1_OP_MATCH_ACT: + case ASN1_OP_MATCH_ACT_OR_SKIP: case ASN1_OP_MATCH_ANY: + case ASN1_OP_MATCH_ANY_ACT: case ASN1_OP_COND_MATCH_OR_SKIP: + case ASN1_OP_COND_MATCH_ACT_OR_SKIP: case ASN1_OP_COND_MATCH_ANY: - skip_data: + case ASN1_OP_COND_MATCH_ANY_ACT: + if (!(flags & FLAG_CONS)) { if (flags & FLAG_INDEFINITE_LENGTH) { + size_t tmp = dp; + ret = asn1_find_indefinite_length( - data, datalen, &dp, &len, &errmsg); + data, datalen, &tmp, &len, &errmsg); if (ret < 0) goto error; - } else { - dp += len; } pr_debug("- LEAF: %zu\n", len); } + + if (op & ASN1_OP_MATCH__ACT) { + unsigned char act; + + if (op & ASN1_OP_MATCH__ANY) + act = machine[pc + 1]; + else + act = machine[pc + 2]; + ret = actions[act](context, hdr, tag, data + dp, len); + if (ret < 0) + return ret; + } + + if (!(flags & FLAG_CONS)) + dp += len; pc += asn1_op_lengths[op]; goto next_op; diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 043cd43109ae..30b08bfc1dde 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -1375,10 +1375,7 @@ int ip_getsockopt(struct sock *sk, int level, if (get_user(len, optlen)) return -EFAULT; - lock_sock(sk); - err = nf_getsockopt(sk, PF_INET, optname, optval, - &len); - release_sock(sk); + err = nf_getsockopt(sk, PF_INET, optname, optval, &len); if (err >= 0) err = put_user(len, optlen); return err; @@ -1410,9 +1407,7 @@ int compat_ip_getsockopt(struct sock *sk, int level, int optname, if (get_user(len, optlen)) return -EFAULT; - lock_sock(sk); err = compat_nf_getsockopt(sk, PF_INET, optname, optval, &len); - release_sock(sk); if (err >= 0) err = put_user(len, optlen); return err; diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index c31f8be7fe66..d0d7112bb7c9 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -1314,10 +1314,7 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname, if (get_user(len, optlen)) return -EFAULT; - lock_sock(sk); - err = nf_getsockopt(sk, PF_INET6, optname, optval, - &len); - release_sock(sk); + err = nf_getsockopt(sk, PF_INET6, optname, optval, &len); if (err >= 0) err = put_user(len, optlen); } @@ -1356,10 +1353,7 @@ int compat_ipv6_getsockopt(struct sock *sk, int level, int optname, if (get_user(len, optlen)) return -EFAULT; - lock_sock(sk); - err = compat_nf_getsockopt(sk, PF_INET6, - optname, optval, &len); - release_sock(sk); + err = compat_nf_getsockopt(sk, PF_INET6, optname, optval, &len); if (err >= 0) err = put_user(len, optlen); } diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 095e3958d83c..d061814d1ae1 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2769,7 +2769,7 @@ cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon) } if (beacon->probe_resp_len) { new_beacon->probe_resp_len = beacon->probe_resp_len; - beacon->probe_resp = pos; + new_beacon->probe_resp = pos; memcpy(pos, beacon->probe_resp, beacon->probe_resp_len); pos += beacon->probe_resp_len; }

7 years, 4 months

1
0
0 0

Patch "vsprintf: avoid misleading "(null)" for %px" has been added to the 4.15-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled vsprintf: avoid misleading "(null)" for %px to the 4.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: vsprintf-avoid-misleading-null-for-px.patch and it can be found in the queue-4.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 3a129cc2151425e5aeb69aeb25fbc994ec738137 Mon Sep 17 00:00:00 2001 From: Adam Borowski <kilobyte(a)angband.pl> Date: Sun, 4 Feb 2018 18:45:21 +0100 Subject: vsprintf: avoid misleading "(null)" for %px From: Adam Borowski <kilobyte(a)angband.pl> commit 3a129cc2151425e5aeb69aeb25fbc994ec738137 upstream. Like %pK already does, print "00000000" instead. This confused people -- the convention is that "(null)" means you tried to dereference a null pointer as opposed to printing the address. Link: http://lkml.kernel.org/r/20180204174521.21383-1-kilobyte@angband.pl To: Sergey Senozhatsky <sergey.senozhatsky(a)gmail.com> To: Steven Rostedt <rostedt(a)goodmis.org> To: linux-kernel(a)vger.kernel.org Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Joe Perches <joe(a)perches.com> Cc: Kees Cook <keescook(a)chromium.org> Cc: "Roberts, William C" <william.c.roberts(a)intel.com> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: David Laight <David.Laight(a)ACULAB.COM> Cc: Randy Dunlap <rdunlap(a)infradead.org> Cc: Geert Uytterhoeven <geert(a)linux-m68k.org> Signed-off-by: Adam Borowski <kilobyte(a)angband.pl> Signed-off-by: Petr Mladek <pmladek(a)suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- lib/vsprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1849,7 +1849,7 @@ char *pointer(const char *fmt, char *buf { const int default_width = 2 * sizeof(void *); - if (!ptr && *fmt != 'K') { + if (!ptr && *fmt != 'K' && *fmt != 'x') { /* * Print (null) with the same width as a pointer so it makes * tabular output look nice. Patches currently in stable-queue which might be from kilobyte(a)angband.pl are queue-4.15/vsprintf-avoid-misleading-null-for-px.patch

7 years, 4 months

1
0
0 0

4.15 stable: Fixing kallsyms

by Kees Cook

Hi, Please include 3a129cc21514 ("vsprintf: avoid misleading "(null)" for %px") in the 4.15 stable tree. That patch should have had these fields: Fixes: 668533dc0764 ("kallsyms: take advantage of the new '%px' format") Cc: stable(a)vger.kernel.org But I didn't notice when it went by originally. (Thanks to Steve for pointing this out as being missed for 4.15.) :) Thanks! -Kees -- Kees Cook Pixel Security

7 years, 4 months

2
1
0 0

Patch "ipv6: Skip XFRM lookup if dst_entry in socket cache is valid" has been added to the 3.18-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled ipv6: Skip XFRM lookup if dst_entry in socket cache is valid to the 3.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: ipv6-skip-xfrm-lookup-if-dst_entry-in-socket-cache-is-valid.patch and it can be found in the queue-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 00bc0ef5880dc7b82f9c320dead4afaad48e47be Mon Sep 17 00:00:00 2001 From: Jakub Sitnicki <jkbs(a)redhat.com> Date: Wed, 8 Jun 2016 15:13:34 +0200 Subject: ipv6: Skip XFRM lookup if dst_entry in socket cache is valid From: Jakub Sitnicki <jkbs(a)redhat.com> commit 00bc0ef5880dc7b82f9c320dead4afaad48e47be upstream. At present we perform an xfrm_lookup() for each UDPv6 message we send. The lookup involves querying the flow cache (flow_cache_lookup) and, in case of a cache miss, creating an XFRM bundle. If we miss the flow cache, we can end up creating a new bundle and deriving the path MTU (xfrm_init_pmtu) from on an already transformed dst_entry, which we pass from the socket cache (sk->sk_dst_cache) down to xfrm_lookup(). This can happen only if we're caching the dst_entry in the socket, that is when we're using a connected UDP socket. To put it another way, the path MTU shrinks each time we miss the flow cache, which later on leads to incorrectly fragmented payload. It can be observed with ESPv6 in transport mode: 1) Set up a transformation and lower the MTU to trigger fragmentation # ip xfrm policy add dir out src ::1 dst ::1 \ tmpl src ::1 dst ::1 proto esp spi 1 # ip xfrm state add src ::1 dst ::1 \ proto esp spi 1 enc 'aes' 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b # ip link set dev lo mtu 1500 2) Monitor the packet flow and set up an UDP sink # tcpdump -ni lo -ttt & # socat udp6-listen:12345,fork /dev/null & 3) Send a datagram that needs fragmentation with a connected socket # perl -e 'print "@" x 1470 | socat - udp6:[::1]:12345 2016/06/07 18:52:52 socat[724] E read(3, 0x555bb3d5ba00, 8192): Protocol error 00:00:00.000000 IP6 ::1 > ::1: frag (0|1448) ESP(spi=0x00000001,seq=0x2), length 1448 00:00:00.000014 IP6 ::1 > ::1: frag (1448|32) 00:00:00.000050 IP6 ::1 > ::1: ESP(spi=0x00000001,seq=0x3), length 1272 (^ ICMPv6 Parameter Problem) 00:00:00.000022 IP6 ::1 > ::1: ESP(spi=0x00000001,seq=0x5), length 136 4) Compare it to a non-connected socket # perl -e 'print "@" x 1500' | socat - udp6-sendto:[::1]:12345 00:00:40.535488 IP6 ::1 > ::1: frag (0|1448) ESP(spi=0x00000001,seq=0x6), length 1448 00:00:00.000010 IP6 ::1 > ::1: frag (1448|64) What happens in step (3) is: 1) when connecting the socket in __ip6_datagram_connect(), we perform an XFRM lookup, miss the flow cache, create an XFRM bundle, and cache the destination, 2) afterwards, when sending the datagram, we perform an XFRM lookup, again, miss the flow cache (due to mismatch of flowi6_iif and flowi6_oif, which is an issue of its own), and recreate an XFRM bundle based on the cached (and already transformed) destination. To prevent the recreation of an XFRM bundle, avoid an XFRM lookup altogether whenever we already have a destination entry cached in the socket. This prevents the path MTU shrinkage and brings us on par with UDPv4. The fix also benefits connected PINGv6 sockets, another user of ip6_sk_dst_lookup_flow(), who also suffer messages being transformed twice. Joint work with Hannes Frederic Sowa. Reported-by: Jan Tluka <jtluka(a)redhat.com> Signed-off-by: Jakub Sitnicki <jkbs(a)redhat.com> Acked-by: Hannes Frederic Sowa <hannes(a)stressinduktion.org> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Benedict Wong <benedictwong(a)google.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- net/ipv6/ip6_output.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1038,17 +1038,12 @@ struct dst_entry *ip6_sk_dst_lookup_flow const struct in6_addr *final_dst) { struct dst_entry *dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie); - int err; dst = ip6_sk_dst_check(sk, dst, fl6); + if (!dst) + dst = ip6_dst_lookup_flow(sk, fl6, final_dst); - err = ip6_dst_lookup_tail(sk, &dst, fl6); - if (err) - return ERR_PTR(err); - if (final_dst) - fl6->daddr = *final_dst; - - return xfrm_lookup_route(sock_net(sk), dst, flowi6_to_flowi(fl6), sk, 0); + return dst; } EXPORT_SYMBOL_GPL(ip6_sk_dst_lookup_flow); Patches currently in stable-queue which might be from jkbs(a)redhat.com are queue-3.18/ipv6-skip-xfrm-lookup-if-dst_entry-in-socket-cache-is-valid.patch

7 years, 4 months

1
0
0 0

[PATCH v2 2/2] xen: events: free irqs in error condition

by Amit Shah

In case of errors in irq setup for MSI, free up the allocated irqs. Fixes: 4892c9b4ada9f9 ("xen: add support for MSI message groups") Reported-by: Hooman Mirhadi <mirhadih(a)amazon.com> CC: <stable(a)vger.kernel.org> CC: Roger Pau Monné <roger.pau(a)citrix.com> CC: Boris Ostrovsky <boris.ostrovsky(a)oracle.com> CC: Eduardo Valentin <eduval(a)amazon.com> CC: Juergen Gross <jgross(a)suse.com> CC: Thomas Gleixner <tglx(a)linutronix.de> CC: "K. Y. Srinivasan" <kys(a)microsoft.com> CC: Liu Shuo <shuo.a.liu(a)intel.com> CC: Anoob Soman <anoob.soman(a)citrix.com> Signed-off-by: Amit Shah <aams(a)amazon.com> --- drivers/xen/events/events_base.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index c86d10e..a299586 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -750,11 +750,14 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, ret = irq_set_msi_desc(irq, msidesc); if (ret < 0) - goto error_irq; + goto error_desc; out: mutex_unlock(&irq_mapping_update_lock); return irq; error_irq: + while (--nvec >= i) + xen_free_irq(irq + nvec); +error_desc: while (i > 0) { i--; __unbind_from_irq(irq + i); -- 2.7.3.AMZN Amazon Development Center Germany GmbH Berlin - Dresden - Aachen main office: Krausenstr. 38, 10117 Berlin Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger Ust-ID: DE289237879 Eingetragen am Amtsgericht Charlottenburg HRB 149173 B

7 years, 4 months

4
5
0 0

[PATCH 4.14 00/54] 4.14.23-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.23 release. There are 54 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 Feb 28 20:21:22 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.23-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.23-rc1 Chris Wilson <chris(a)chris-wilson.co.uk> drm/i915/breadcrumbs: Ignore unsubmitted signalers Kai-Heng Feng <kai.heng.feng(a)canonical.com> drm/amdgpu: add new device to use atpx quirk Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: Avoid leaking PM domain on driver unbind (v2) Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: add atpx quirk handling (v2) Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: only check mmBIF_IOV_FUNC_IDENTIFIER on tonga/fiji Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: Add dpm quirk for Jet PRO (v2) Huang Rui <ray.huang(a)amd.com> drm/amdgpu: disable MMHUB power gating on raven Chris Wilson <chris(a)chris-wilson.co.uk> drm: Handle unexpected holes in color-eviction Daniel Vetter <daniel.vetter(a)ffwll.ch> drm/cirrus: Load lut in crtc_commit Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> usb: renesas_usbhs: missed the "running" flag in usb_dmac with rx path Jack Pham <jackp(a)codeaurora.org> usb: gadget: f_fs: Use config_ep_by_speed() Jack Pham <jackp(a)codeaurora.org> usb: gadget: f_fs: Process all descriptors during bind Bin Liu <b-liu(a)ti.com> Revert "usb: musb: host: don't start next rx urb if current one failed" Karsten Koop <kkoop(a)ld-didactic.de> usb: ldusb: add PIDs for new CASSY devices supported by this driver Thinh Nguyen <Thinh.Nguyen(a)synopsys.com> usb: dwc3: ep0: Reset TRB counter for ep0 IN Thinh Nguyen <Thinh.Nguyen(a)synopsys.com> usb: dwc3: gadget: Set maxpacket size for ep0 IN Peter Chen <hzpeterchen(a)gmail.com> usb: host: ehci: use correct device pointer for dma ops Kai-Heng Feng <kai.heng.feng(a)canonical.com> drm/edid: Add 6 bpc quirk for CPT panel in Asus UX303LA Jack Stocker <jackstocker.93(a)gmail.com> Add delay-init quirk for Corsair K70 RGB keyboards Will Deacon <will.deacon(a)arm.com> arm64: cpufeature: Fix CTR_EL0 field definitions Michael Weiser <michael.weiser(a)gmx.de> arm64: Disable unhandled signal log messages by default Michael Weiser <michael.weiser(a)gmx.de> arm64: Remove unimplemented syscall log message AMAN DEEP <aman.deep(a)samsung.com> usb: ohci: Proper handling of ed_rm_list to handle race condition between usb_kill_urb() and finish_unlinks() Shigeru Yoshida <shigeru.yoshida(a)windriver.com> ohci-hcd: Fix race condition caused by ohci_urb_enqueue() and io_watchdog_func() Casey Leedom <leedom(a)chelsio.com> PCI/cxgb4: Extend T3 PCI quirk to T4+ devices Matt Redfearn <matt.redfearn(a)mips.com> irqchip/mips-gic: Avoid spuriously handling masked interrupts Shanker Donthineni <shankerd(a)codeaurora.org> irqchip/gic-v3: Use wmb() instead of smb_wmb() in gic_raise_softirq() Huang Ying <huang.ying.caritas(a)gmail.com> mm, swap, frontswap: fix THP swap if frontswap enabled Arnd Bergmann <arnd(a)arndb.de> x86/oprofile: Fix bogus GCC-8 warning in nmi_setup() Arnd Bergmann <arnd(a)arndb.de> Kbuild: always define endianess in kconfig.h Lars-Peter Clausen <lars(a)metafoo.de> iio: adis_lib: Initialize trigger before requesting interrupt Stefan Windfeldt-Prytz <stefan.windfeldt(a)axis.com> iio: buffer: check if a buffer has been set up when poll is called Andreas Klinger <ak(a)it-klinger.de> iio: srf08: fix link error "devm_iio_triggered_buffer_setup" undefined Fabrice Gasnier <fabrice.gasnier(a)st.com> iio: adc: stm32: fix stm32h7_adc_enable error handling Leon Romanovsky <leonro(a)mellanox.com> RDMA/uverbs: Sanitize user entered port numbers prior to access it Leon Romanovsky <leonro(a)mellanox.com> RDMA/uverbs: Fix circular locking dependency Leon Romanovsky <leonro(a)mellanox.com> RDMA/uverbs: Fix bad unlock balance in ib_uverbs_close_xrcd Leon Romanovsky <leonro(a)mellanox.com> RDMA/uverbs: Protect from command mask overflow Leon Romanovsky <leonro(a)mellanox.com> RDMA/uverbs: Protect from races between lookup and destroy of uobjects Hans de Goede <hdegoede(a)redhat.com> extcon: int3496: process id-pin first so that we start with the right status Eric Biggers <ebiggers(a)google.com> PKCS#7: fix certificate blacklisting Eric Biggers <ebiggers(a)google.com> PKCS#7: fix certificate chain verification Eric Biggers <ebiggers(a)google.com> X.509: fix NULL dereference when restricting key with unsupported_sig Eric Biggers <ebiggers(a)google.com> X.509: fix BUG_ON() when hash algorithm is unsupported Eric Anholt <eric(a)anholt.net> i2c: bcm2835: Set up the rising/falling edge delays Ben Gardner <gardner.ben(a)gmail.com> i2c: designware: must wait for enable Arnd Bergmann <arnd(a)arndb.de> cfg80211: fix cfg80211_beacon_dup James Hogan <jhogan(a)kernel.org> MIPS: Drop spurious __unused in struct compat_flock Tyrel Datwyler <tyreld(a)linux.vnet.ibm.com> scsi: ibmvfc: fix misdefined reserved field in ibmvfc_fcp_rsp_info Max Filippov <jcmvbkbc(a)gmail.com> xtensa: fix high memory/reserved memory collision Kees Cook <keescook(a)chromium.org> MIPS: boot: Define __ASSEMBLY__ for its.S build Kees Cook <keescook(a)chromium.org> kconfig.h: Include compiler types to avoid missed struct attributes Ard Biesheuvel <ard.biesheuvel(a)linaro.org> arm64: mm: don't write garbage into TTBR1_EL1 register Paolo Abeni <pabeni(a)redhat.com> netfilter: drop outermost socket lock in getsockopt() ------------- Diffstat: Makefile | 4 +- arch/arm64/kernel/cpufeature.c | 6 +- arch/arm64/kernel/traps.c | 10 +--- arch/arm64/mm/proc.S | 2 +- arch/mips/boot/Makefile | 1 + arch/mips/include/asm/compat.h | 1 - arch/x86/oprofile/nmi_int.c | 2 +- arch/xtensa/mm/init.c | 70 +++++++++++++++++++++--- crypto/asymmetric_keys/pkcs7_verify.c | 12 ++-- crypto/asymmetric_keys/public_key.c | 4 +- crypto/asymmetric_keys/restrict.c | 21 ++++--- drivers/extcon/extcon-intel-int3496.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 58 +++++++++++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 - drivers/gpu/drm/amd/amdgpu/si_dpm.c | 5 ++ drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +- drivers/gpu/drm/amd/amdgpu/vi.c | 21 ++++--- drivers/gpu/drm/cirrus/cirrus_mode.c | 40 ++++++++------ drivers/gpu/drm/drm_edid.c | 3 + drivers/gpu/drm/drm_mm.c | 21 ++++++- drivers/gpu/drm/i915/intel_breadcrumbs.c | 29 ++++------ drivers/hid/hid-core.c | 3 + drivers/hid/hid-ids.h | 3 + drivers/i2c/busses/i2c-bcm2835.c | 21 ++++++- drivers/i2c/busses/i2c-designware-master.c | 2 +- drivers/iio/adc/stm32-adc.c | 7 ++- drivers/iio/imu/adis_trigger.c | 7 ++- drivers/iio/industrialio-buffer.c | 2 +- drivers/iio/proximity/Kconfig | 2 + drivers/infiniband/core/rdma_core.c | 10 +++- drivers/infiniband/core/uverbs_cmd.c | 16 ++++-- drivers/infiniband/core/uverbs_main.c | 27 ++++++--- drivers/irqchip/irq-gic-v3.c | 2 +- drivers/irqchip/irq-mips-gic.c | 2 - drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 10 ---- drivers/pci/quirks.c | 39 +++++++------ drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- drivers/usb/core/quirks.c | 3 + drivers/usb/dwc3/ep0.c | 7 ++- drivers/usb/dwc3/gadget.c | 2 + drivers/usb/gadget/function/f_fs.c | 44 +++------------ drivers/usb/host/ehci-hub.c | 4 +- drivers/usb/host/ohci-hcd.c | 10 +++- drivers/usb/host/ohci-hub.c | 4 +- drivers/usb/host/ohci-q.c | 17 +++--- drivers/usb/misc/ldusb.c | 6 ++ drivers/usb/musb/musb_host.c | 8 +-- drivers/usb/renesas_usbhs/fifo.c | 5 ++ drivers/xen/tmem.c | 4 ++ include/linux/kconfig.h | 9 +++ mm/zswap.c | 6 ++ net/ipv4/ip_sockglue.c | 7 +-- net/ipv6/ipv6_sockglue.c | 10 +--- net/mac80211/cfg.c | 2 +- 54 files changed, 403 insertions(+), 219 deletions(-)

7 years, 4 months

6
67
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror