ieee802154: hwsim: Fix error handle path in hwsim_init_module
Subsystems (16)
Sasha Levin
maintainerPATCH 3/52 ARM: dts: am57xx: Disable voltage switching for SD card
In reply to Sasha LevinFrom: Faiz Abbas <[email protected]>
[ Upstream commit fb59ee37cfe20d10d19568899d1458a58361246c ]
If UHS speed modes are enabled, a compatible SD card switches down to 1.8V during enumeration. If after this a software reboot/crash takes place and on-chip ROM tries to enumerate the SD card, the difference in IO voltages (host @ 3.3V and card @ 1.8V) may end up damaging the card.
The fix for this is to have support for power cycling the card in hardware (with a PORz/soft-reset line causing a power cycle of the card). Because the beaglebone X15 (rev A,B and C), am57xx-idks and am57xx-evms don't have this capability, disable voltage switching for these boards.
The major effect of this is that the maximum supported speed mode is now high speed(50 MHz) down from SDR104(200 MHz).
commit 88a748419b84 ("ARM: dts: am57xx-idk: Remove support for voltage switching for SD card") did this only for idk boards. Do it for all affected boards.
--- arch/arm/boot/dts/am571x-idk.dts | 7 +------ arch/arm/boot/dts/am572x-idk.dts | 7 +------ arch/arm/boot/dts/am574x-idk.dts | 7 +------ arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 1 + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 7 +------ arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 7 +------ 6 files changed, 6 insertions(+), 30 deletions(-)
arch/arm/boot/dts/am571x-idk.dts +1 -6
@@ -98,14 +98,9 @@ }; &mmc1 { - pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; + pinctrl-names = "default", "hs"; pinctrl-0 = <&mmc1_pins_default_no_clk_pu>; pinctrl-1 = <&mmc1_pins_hs>; - pinctrl-2 = <&mmc1_pins_sdr12>; - pinctrl-3 = <&mmc1_pins_sdr25>; - pinctrl-4 = <&mmc1_pins_sdr50>; - pinctrl-5 = <&mmc1_pins_ddr50_rev20 &mmc1_iodelay_ddr50_conf>; - pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>; }; &mmc2 {
arch/arm/boot/dts/am572x-idk.dts +1 -6
@@ -20,14 +20,9 @@ }; &mmc1 { - pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; + pinctrl-names = "default", "hs"; pinctrl-0 = <&mmc1_pins_default_no_clk_pu>; pinctrl-1 = <&mmc1_pins_hs>; - pinctrl-2 = <&mmc1_pins_sdr12>; - pinctrl-3 = <&mmc1_pins_sdr25>; - pinctrl-4 = <&mmc1_pins_sdr50>; - pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev20_conf>; - pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>; }; &mmc2 {
arch/arm/boot/dts/am574x-idk.dts +1 -6
@@ -24,14 +24,9 @@ }; &mmc1 { - pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; + pinctrl-names = "default", "hs"; pinctrl-0 = <&mmc1_pins_default_no_clk_pu>; pinctrl-1 = <&mmc1_pins_hs>; - pinctrl-2 = <&mmc1_pins_default>; - pinctrl-3 = <&mmc1_pins_hs>; - pinctrl-4 = <&mmc1_pins_sdr50>; - pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_conf>; - pinctrl-6 = <&mmc1_pins_ddr50 &mmc1_iodelay_sdr104_conf>; }; &mmc2 {
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +1 -0
@@ -433,6 +433,7 @@ bus-width = <4>; cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */ + no-1-8-v; }; &mmc2 {
arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts +1 -6
@@ -19,14 +19,9 @@ }; &mmc1 { - pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; + pinctrl-names = "default", "hs"; pinctrl-0 = <&mmc1_pins_default>; pinctrl-1 = <&mmc1_pins_hs>; - pinctrl-2 = <&mmc1_pins_sdr12>; - pinctrl-3 = <&mmc1_pins_sdr25>; - pinctrl-4 = <&mmc1_pins_sdr50>; - pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev11_conf>; - pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev11_conf>; vmmc-supply = <&vdd_3v3>; vqmmc-supply = <&ldo1_reg>; };
arch/arm/boot/dts/am57xx-beagle-x15-revc.dts +1 -6
@@ -19,14 +19,9 @@ }; &mmc1 { - pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; + pinctrl-names = "default", "hs"; pinctrl-0 = <&mmc1_pins_default>; pinctrl-1 = <&mmc1_pins_hs>; - pinctrl-2 = <&mmc1_pins_sdr12>; - pinctrl-3 = <&mmc1_pins_sdr25>; - pinctrl-4 = <&mmc1_pins_sdr50>; - pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev20_conf>; - pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>; vmmc-supply = <&vdd_3v3>; vqmmc-supply = <&ldo1_reg>; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/52 ARM: OMAP2+: Fix missing SYSC_HAS_RESET_STATUS for dra7 epwmss
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit afd58b162e48076e3fe66d08a69eefbd6fe71643 ]
TRM says PWMSS_SYSCONFIG bit for SOFTRESET changes to zero when reset is completed. Let's configure it as otherwise we get warnings on boot when we check the data against dts provided data. Eventually the legacy platform data will be just dropped, but let's fix the warning first.
--- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +2 -1
@@ -385,7 +385,8 @@ static struct omap_hwmod dra7xx_dcan2_hwmod = {static struct omap_hwmod_class_sysconfig dra7xx_epwmss_sysc = { .rev_offs =0x0 , .sysc_offs =0x4 , - .sysc_flags =SYSC_HAS_SIDLEMODE |SYSC_HAS_SOFTRESET , + .sysc_flags =SYSC_HAS_SIDLEMODE |SYSC_HAS_SOFTRESET | +SYSC_HAS_RESET_STATUS , .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), .sysc_fields = &omap_hwmod_sysc_type2, };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/52 s390/bpf: fix lcgr instruction encoding
In reply to Sasha LevinFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit bb2d267c448f4bc3a3389d97c56391cb779178ae ]
"masking, test in bounds 3" fails on s390, because BPF_ALU64_IMM(BPF_NEG, BPF_REG_2, 0) ignores the top 32 bits of BPF_REG_2. The reason is that JIT emits lcgfr instead of lcgr. The associated comment indicates that the code was intended to emit lcgr in the first place, it's just that the wrong opcode was used.
Fix by using the correct opcode.
--- arch/s390/net/bpf_jit_comp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/net/bpf_jit_comp.c +1 -1
@@ -841,7 +841,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int ibreak ;case BPF_ALU64 |BPF_NEG :/* dst = -dst */ /* lcgr %dst,%dst */ -EMIT4 (0xb9130000 , dst_reg, dst_reg); +EMIT4 (0xb9030000 , dst_reg, dst_reg);break ;/* * BPF_FROM_BE/LE
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/52 ARM: OMAP2+: Fix omap4 errata warning on other SoCs
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 45da5e09dd32fa98c32eaafe2513db6bd75e2f4f ]
We have errata i688 workaround produce warnings on SoCs other than omap4 and omap5:
omap4_sram_init:Unable to allocate sram needed to handle errata I688 omap4_sram_init:Unable to get sram pool needed to handle errata I688
This is happening because there is no ti,omap4-mpu node, or no SRAM to configure for the other SoCs, so let's remove the warning based on the SoC revision checks.
As nobody has complained it seems that the other SoC variants do not need this workaround.
--- arch/arm/mach-omap2/omap4-common.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/mach-omap2/omap4-common.c +3 -0
@@ -131,6 +131,9 @@ static int __init omap4_sram_init(void)struct device_node *np;struct gen_pool *sram_pool; +if (!soc_is_omap44xx () && !soc_is_omap54xx ()) +return 0 ; + np =of_find_compatible_node (NULL ,NULL ,"ti,omap4-mpu" );if (!np) pr_warn("%s:Unable to allocate sram needed to handle errata I688\n",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/52 ARM: dts: dra74x: Fix iodelay configuration for mmc3
In reply to Sasha LevinFrom: Faiz Abbas <[email protected]>
[ Upstream commit 07f9a8be66a9bd86f9eaedf8f8aeb416195adab8 ]
According to the latest am572x[1] and dra74x[2] data manuals, mmc3 default, hs, sdr12 and sdr25 modes use iodelay values given in MMC3_MANUAL1. Set the MODE_SELECT bit for these so that manual mode is selected and correct iodelay values can be configured.
[1] http://www.ti.com/lit/ds/symlink/am5728.pdf
[2] http://www.ti.com/lit/ds/symlink/dra746.pdf
--- arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 50 +++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-)
arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi +25 -25
@@ -32,7 +32,7 @@ * * Datamanual Revisions: * - * AM572x Silicon Revision 2.0: SPRS953B, Revised November 2016 + * AM572x Silicon Revision 2.0: SPRS953F, Revised May 2019 * AM572x Silicon Revision 1.1: SPRS915R, Revised November 2016 * */
@@ -229,45 +229,45 @@ mmc3_pins_default: mmc3_pins_default { pinctrl-single,pins = < - DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_clk.mmc3_clk */ - DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */ - DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */ - DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */ - DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */ - DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */ + DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */ + DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */ + DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */ + DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */ + DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */ + DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */ >; }; mmc3_pins_hs: mmc3_pins_hs { pinctrl-single,pins = < - DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_clk.mmc3_clk */ - DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */ - DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */ - DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */ - DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */ - DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */ + DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */ + DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */ + DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */ + DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */ + DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */ + DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */ >; }; mmc3_pins_sdr12: mmc3_pins_sdr12 { pinctrl-single,pins = < - DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_clk.mmc3_clk */ - DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */ - DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */ - DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */ - DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */ - DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */ + DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */ + DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */ + DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */ + DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */ + DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */ + DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */ >; }; mmc3_pins_sdr25: mmc3_pins_sdr25 { pinctrl-single,pins = < - DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_clk.mmc3_clk */ - DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */ - DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */ - DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */ - DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */ - DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */ + DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */ + DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */ + DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */ + DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */ + DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */ + DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */ >; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/52 ARM: OMAP1: ams-delta-fiq: Fix missing irq_ack
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit fa8397e45c64e60c80373bc19ee56e42a6bed9b6 ]
Non-serio path of Amstrad Delta FIQ deferred handler depended on irq_ack() method provided by OMAP GPIO driver. That method has been removed by commit 693de831c6e5 ("gpio: omap: remove irq_ack method"). Remove useless code from the deferred handler and reimplement the missing operation inside the base FIQ handler.
Should another dependency - irq_unmask() - be ever removed from the OMAP GPIO driver, WARN once if missing.
--- arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 ++- arch/arm/mach-omap1/ams-delta-fiq.c | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-)
arch/arm/mach-omap1/ams-delta-fiq-handler.S +2 -1
@@ -135,6 +135,8 @@ restart: orr r11, r11, r13 @ mask all requested interrupts str r11, [r12, #OMAP1510_GPIO_INT_MASK] + str r13, [r12, #OMAP1510_GPIO_INT_STATUS] @ ack all requested interrupts + ands r10, r13, #KEYBRD_CLK_MASK @ extract keyboard status - set? beq hksw @ no - try next source
@@ -142,7 +144,6 @@ restart: @@@@@@@@@@@@@@@@@@@@@@ @ Keyboard clock FIQ mode interrupt handler @ r10 now contains KEYBRD_CLK_MASK, use it - str r10, [r12, #OMAP1510_GPIO_INT_STATUS] @ ack the interrupt bic r11, r11, r10 @ unmask it str r11, [r12, #OMAP1510_GPIO_INT_MASK]
arch/arm/mach-omap1/ams-delta-fiq.c +1 -3
@@ -73,9 +73,7 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id)* interrupts default to since commit 80ac93c27441 * requires interrupt already acked and unmasked. */ -if (irq_chip->irq_ack) - irq_chip->irq_ack (d); -if (irq_chip->irq_unmask) +if (!WARN_ON_ONCE (!irq_chip->irq_unmask)) irq_chip->irq_unmask (d); }for (; irq_counter[gpio] < fiq_count; irq_counter[gpio]++)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/52 s390/bpf: use 32-bit index for tail calls
In reply to Sasha LevinFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit 91b4db5313a2c793aabc2143efb8ed0cf0fdd097 ]
"p runtime/jit: pass > 32bit index to tail_call" fails when bpf_jit_enable=1, because the tail call is not executed.
This in turn is because the generated code assumes index is 64-bit, while it must be 32-bit, and as a result prog array bounds check fails, while it should pass. Even if bounds check would have passed, the code that follows uses 64-bit index to compute prog array offset.
Fix by using clrj instead of clgrj for comparing index with array size, and also by using llgfr for truncating index to 32 bits before using it to compute prog array offset.
--- arch/s390/net/bpf_jit_comp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/s390/net/bpf_jit_comp.c +6 -4
@@ -1015,8 +1015,8 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i/* llgf %w1,map.max_entries(%b2) */ EMIT6_DISP_LH (0xe3000000 ,0x0016 ,REG_W1 ,REG_0 ,BPF_REG_2 , offsetof(struct bpf_array, map.max_entries)); -/* clgrj %b3,%w1,0xa,label0: if %b3 >= %w1 goto out */ -EMIT6_PCREL_LABEL (0xec000000 ,0x0065 ,BPF_REG_3 , +/* clrj %b3,%w1,0xa,label0: if (u32)%b3 >= (u32)%w1 goto out */ +EMIT6_PCREL_LABEL (0xec000000 ,0x0077 ,BPF_REG_3 ,REG_W1 ,0 ,0xa );/*
@@ -1042,8 +1042,10 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i* goto out; */ -/* sllg %r1,%b3,3: %r1 = index * 8 */ -EMIT6_DISP_LH (0xeb000000 ,0x000d ,REG_1 ,BPF_REG_3 ,REG_0 ,3 ); +/* llgfr %r1,%b3: %r1 = (u32) index */ +EMIT4 (0xb9160000 ,REG_1 ,BPF_REG_3 ); +/* sllg %r1,%r1,3: %r1 *= 8 */ +EMIT6_DISP_LH (0xeb000000 ,0x000d ,REG_1 ,REG_1 ,REG_0 ,3 );/* lg %r1,prog(%b2,%r1) */ EMIT6_DISP_LH (0xe3000000 ,0x0004 ,REG_1 ,BPF_REG_2 ,REG_1 , offsetof(struct bpf_array , ptrs));
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/52 fpga: altera-ps-spi: Fix getting of optional confd gpio
In reply to Sasha LevinFrom: Phil Reid <[email protected]>
[ Upstream commit dec43da46f63eb71f519d963ba6832838e4262a3 ]
Currently the driver does not handle EPROBE_DEFER for the confd gpio. Use devm_gpiod_get_optional() instead of devm_gpiod_get() and return error codes from altera_ps_probe().
--- drivers/fpga/altera-ps-spi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/fpga/altera-ps-spi.c +7 -4
@@ -207,7 +207,7 @@ static int altera_ps_write_complete(struct fpga_manager *mgr,return -EIO ; } -if (!IS_ERR (conf->confd)) { +if (conf->confd) {if (!gpiod_get_raw_value_cansleep (conf->confd)) {dev_err (&mgr->dev,"CONF_DONE is inactive!\n" );return -EIO ;
@@ -265,10 +265,13 @@ static int altera_ps_probe(struct spi_device *spi)return PTR_ERR (conf->status); } - conf->confd =devm_gpiod_get (&spi->dev,"confd" ,GPIOD_IN ); + conf->confd =devm_gpiod_get_optional (&spi->dev,"confd" ,GPIOD_IN );if (IS_ERR (conf->confd)) { -dev_warn (&spi->dev,"Not using confd gpio: %ld\n" , -PTR_ERR (conf->confd)); +dev_err (&spi->dev,"Failed to get confd gpio: %ld\n" , +PTR_ERR (conf->confd)); +return PTR_ERR (conf->confd); + }else if (!conf->confd) { +dev_warn (&spi->dev,"Not using confd gpio" ); }/* Register manager with unique name */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 39/52 usb: host: xhci-tegra: Set DMA mask correctly
In reply to Sasha LevinFrom: Nagarjuna Kristam <[email protected]>
[ Upstream commit 993cc8753453fccfe060a535bbe21fcf1001b626 ]
The Falcon microcontroller that runs the XUSB firmware and which is responsible for exposing the XHCI interface can address only 40 bits of memory. Typically that's not a problem because Tegra devices don't have enough system memory to exceed those 40 bits.
However, if the ARM SMMU is enable on Tegra186 and later, the addresses passed to the XUSB controller can be anywhere in the 48-bit IOV address space of the ARM SMMU. Since the DMA/IOMMU API starts allocating from the top of the IOVA space, the Falcon microcontroller is not able to load the firmware successfully.
Fix this by setting the DMA mask to 40 bits, which will force the DMA API to map the buffer for the firmware to an IOVA that is addressable by the Falcon.
--- drivers/usb/host/xhci-tegra.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/usb/host/xhci-tegra.c +10 -0
@@ -1148,6 +1148,16 @@ static int tegra_xusb_probe(struct platform_device *pdev)tegra_xusb_ipfs_config (tegra, regs); +/* +* The XUSB Falcon microcontroller can only address 40 bits, so set +* the DMA mask accordingly. +*/ + err =dma_set_mask_and_coherent (tegra->dev,DMA_BIT_MASK (40 )); +if (err <0 ) { +dev_err (&pdev->dev,"failed to set DMA mask: %d\n" , err); + goto put_rpm; + } + err =tegra_xusb_load_firmware (tegra);if (err <0 ) {dev_err (&pdev->dev,"failed to load firmware: %d\n" , err);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 43/52 i2c: designware: Synchronize IRQs when unregistering slave client
In reply to Sasha LevinFrom: Jarkko Nikula <[email protected]>
[ Upstream commit c486dcd2f1bbdd524a1e0149734b79e4ae329650 ]
Make sure interrupt handler i2c_dw_irq_handler_slave() has finished before clearing the the dev->slave pointer in i2c_dw_unreg_slave().
There is possibility for a race if i2c_dw_irq_handler_slave() is running on another CPU while clearing the dev->slave pointer.
--- drivers/i2c/busses/i2c-designware-slave.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-designware-slave.c +1 -0
@@ -94,6 +94,7 @@ static int i2c_dw_unreg_slave(struct i2c_client *slave) dev->disable_int (dev); dev->disable (dev); +synchronize_irq (dev->irq); dev->slave =NULL ;pm_runtime_put (dev->dev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 1/52 ieee802154: hwsim: Fix error handle path in hwsim_init_module
From: YueHaibing <[email protected]>
[ Upstream commit 1cbbbf39efab05fae67f59e6ed01bb85061c69e2 ]
KASAN report this:
BUG: unable to handle kernel paging request at fffffbfff834f001 PGD 237fe8067 P4D 237fe8067 PUD 237e64067 PMD 1c968d067 PTE 0 Oops: 0000 [#1] SMP KASAN PTI CPU: 1 PID: 8871 Comm: syz-executor.0 Tainted: G C 5.0.0+ #5 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 RIP: 0010:strcmp+0x31/0xa0 lib/string.c:328 Code: 00 00 00 00 fc ff df 55 53 48 83 ec 08 eb 0a 84 db 48 89 ef 74 5a 4c 89 e6 48 89 f8 48 89 fa 48 8d 6f 01 48 c1 e8 03 83 e2 07 <42> 0f b6 04 28 38 d0 7f 04 84 c0 75 50 48 89 f0 48 89 f2 0f b6 5d RSP: 0018:ffff8881e0c57800 EFLAGS: 00010246 RAX: 1ffffffff834f001 RBX: ffffffffc1a78000 RCX: ffffffff827b9503 RDX: 0000000000000000 RSI: ffffffffc1a40008 RDI: ffffffffc1a78008 RBP: ffffffffc1a78009 R08: fffffbfff6a92195 R09: fffffbfff6a92195 R10: ffff8881e0c578b8 R11: fffffbfff6a92194 R12: ffffffffc1a40008 R13: dffffc0000000000 R14: ffffffffc1a3e470 R15: ffffffffc1a40000 FS: 00007fdcc02ff700(0000) GS:ffff8881f7300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: fffffbfff834f001 CR3: 00000001b3134003 CR4: 00000000007606e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: genl_family_find_byname+0x7f/0xf0 net/netlink/genetlink.c:104 genl_register_family+0x1e1/0x1070 net/netlink/genetlink.c:333 ? 0xffffffffc1978000 hwsim_init_module+0x6a/0x1000 [mac802154_hwsim] ? 0xffffffffc1978000 ? 0xffffffffc1978000 ? 0xffffffffc1978000 do_one_initcall+0xbc/0x47d init/main.c:887 do_init_module+0x1b5/0x547 kernel/module.c:3456 load_module+0x6405/0x8c10 kernel/module.c:3804 __do_sys_finit_module+0x162/0x190 kernel/module.c:3898 do_syscall_64+0x9f/0x450 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x462e99 Code: f7 d8 64 89 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007fdcc02fec58 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 RAX: ffffffffffffffda RBX: 000000000073bf00 RCX: 0000000000462e99 RDX: 0000000000000000 RSI: 0000000020000200 RDI: 0000000000000003 RBP: 00007fdcc02fec70 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007fdcc02ff6bc R13: 00000000004bcefa R14: 00000000006f6fb0 R15: 0000000000000004 Modules linked in: mac802154_hwsim(+) mac802154 ieee802154 speakup(C) rc_proteus_2309 rtc_rk808 streebog_generic rds vboxguest madera_spi madera da9052_wdt mISDN_core ueagle_atm usbatm atm ir_imon_decoder scsi_transport_sas rc_dntv_live_dvb_t panel_samsung_s6d16d0 drm drm_panel_orientation_quirks lib80211 fb_agm1264k_fl(C) gspca_pac7302 gspca_main videobuf2_v4l2 soundwire_intel_init i2c_dln2 dln2 usbcore hid_gaff 88pm8607 nfnetlink axp20x_i2c axp20x uio pata_marvell pmbus_core snd_sonicvibes gameport snd_pcm snd_opl3_lib snd_timer snd_hwdep snd_mpu401_uart snd_rawmidi snd_seq_device snd soundcore rtc_ds1511 rtc_ds1742 vsock dwc_xlgmac rtc_rx8010 libphy twofish_x86_64_3way twofish_x86_64 twofish_common ad5696_i2c ad5686 lp8788_charger cxd2880_spi dvb_core videobuf2_common videodev media videobuf2_vmalloc videobuf2_memops fbtft(C) sysimgblt sysfillrect syscopyarea fb_sys_fops janz_ican3 firewire_net firewire_core crc_itu_t spi_slave_system_control i2c_matroxfb i2c_algo_bit matroxfb_base fb fbdev matroxfb_DAC1064 matroxfb_accel cfbcopyarea cfbimgblt cfbfillrect matroxfb_Ti3026 matroxfb_g450 g450_pll matroxfb_misc leds_blinkm ti_dac7311 intel_spi_pci intel_spi spi_nor hid_elan hid async_tx rc_cinergy_1400 rc_core intel_ishtp kxcjk_1013 industrialio_triggered_buffer kfifo_buf can_dev intel_th spi_pxa2xx_platform pata_artop vme_ca91cx42 gb_gbphy(C) greybus(C) industrialio mptbase st_drv cmac ttpci_eeprom via_wdt gpio_xra1403 mtd iptable_security iptable_raw iptable_mangle iptable_nat nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 iptable_filter bpfilter ip6_vti ip_vti ip_gre ipip sit tunnel4 ip_tunnel hsr veth netdevsim vxcan batman_adv cfg80211 rfkill chnl_net caif nlmon dummy team bonding vcan bridge stp llc ip6_gre gre ip6_tunnel tunnel6 tun joydev mousedev ppdev kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul crc32c_intel ghash_clmulni_intel aesni_intel aes_x86_64 input_leds crypto_simd cryptd glue_helper ide_pci_generic piix psmouse ide_core serio_raw ata_generic i2c_piix4 pata_acpi parport_pc parport floppy rtc_cmos intel_agp intel_gtt agpgart sch_fq_codel ip_tables x_tables sha1_ssse3 sha1_generic ipv6 [last unloaded: speakup] Dumping ftrace buffer: (ftrace buffer empty) CR2: fffffbfff834f001 ---[ end trace 5aa772c793e0e971 ]--- RIP: 0010:strcmp+0x31/0xa0 lib/string.c:328 Code: 00 00 00 00 fc ff df 55 53 48 83 ec 08 eb 0a 84 db 48 89 ef 74 5a 4c 89 e6 48 89 f8 48 89 fa 48 8d 6f 01 48 c1 e8 03 83 e2 07 <42> 0f b6 04 28 38 d0 7f 04 84 c0 75 50 48 89 f0 48 89 f2 0f b6 5d RSP: 0018:ffff8881e0c57800 EFLAGS: 00010246 RAX: 1ffffffff834f001 RBX: ffffffffc1a78000 RCX: ffffffff827b9503 RDX: 0000000000000000 RSI: ffffffffc1a40008 RDI: ffffffffc1a78008 RBP: ffffffffc1a78009 R08: fffffbfff6a92195 R09: fffffbfff6a92195 R10: ffff8881e0c578b8 R11: fffffbfff6a92194 R12: ffffffffc1a40008 R13: dffffc0000000000 R14: ffffffffc1a3e470 R15: ffffffffc1a40000 FS: 00007fdcc02ff700(0000) GS:ffff8881f7300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: fffffbfff834f001 CR3: 00000001b3134003 CR4: 00000000007606e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
PKRU: 55555554
The error handing path misplace the cleanup in hwsim_init_module, switch the two cleanup functions to fix above issues.
--- drivers/net/ieee802154/mac802154_hwsim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ieee802154/mac802154_hwsim.c +2 -2
@@ -920,9 +920,9 @@ static __init int hwsim_init_module(void)return 0 ; platform_drv: -genl_unregister_family (&hwsim_genl_family); -platform_dev:platform_device_unregister (mac802154hwsim_dev); +platform_dev: +genl_unregister_family (&hwsim_genl_family);return rc; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/52 ieee802154: hwsim: unregister hw while hwsim_subscribe_all_others fails
From: YueHaibing <[email protected]>
[ Upstream commit de166bbe861738c8bc3e5dad5b03f45d7d6ef914 ]
KASAN report this:
kernel BUG at net/mac802154/main.c:130!
invalid opcode: 0000 [#1] PREEMPT SMP
CPU: 0 PID: 19932 Comm: modprobe Not tainted 5.1.0-rc6+ #22 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.3-0-ge2fc41e-prebuilt.qemu-project.org 04/01/2014 RIP: 0010:ieee802154_free_hw+0x2a/0x30 [mac802154] Code: 55 48 8d 57 38 48 89 e5 53 48 89 fb 48 8b 47 38 48 39 c2 75 15 48 8d 7f 48 e8 82 85 16 e1 48 8b 7b 28 e8 f9 ef 83 e2 5b 5d c3 <0f> 0b 0f 1f 40 00 55 48 89 e5 53 48 89 fb 0f b6 86 80 00 00 00 88 RSP: 0018:ffffc90001c7b9f0 EFLAGS: 00010206 RAX: ffff88822df3aa80 RBX: ffff88823143d5c0 RCX: 0000000000000002 RDX: ffff88823143d5f8 RSI: ffff88822b1fabc0 RDI: ffff88823143d5c0 RBP: ffffc90001c7b9f8 R08: 0000000000000000 R09: 0000000000000001 R10: 0000000000000000 R11: 0000000000000000 R12: 00000000fffffff4 R13: ffff88822dea4f50 R14: ffff88823143d7c0 R15: 00000000fffffff4 FS: 00007ff52e999540(0000) GS:ffff888237a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fdc06dba768 CR3: 000000023160a000 CR4: 00000000000006f0 Call Trace: hwsim_add_one+0x2dd/0x540 [mac802154_hwsim] hwsim_probe+0x2f/0xb0 [mac802154_hwsim] platform_drv_probe+0x3a/0x90 ? driver_sysfs_add+0x79/0xb0 really_probe+0x1d4/0x2d0 driver_probe_device+0x50/0xf0 device_driver_attach+0x54/0x60 __driver_attach+0x7e/0xd0 ? device_driver_attach+0x60/0x60 bus_for_each_dev+0x68/0xc0 driver_attach+0x19/0x20 bus_add_driver+0x15e/0x200 driver_register+0x5b/0xf0 __platform_driver_register+0x31/0x40 hwsim_init_module+0x74/0x1000 [mac802154_hwsim] ? 0xffffffffa00e9000 do_one_initcall+0x6c/0x3cc ? kmem_cache_alloc_trace+0x248/0x3b0 do_init_module+0x5b/0x1f1 load_module+0x1db1/0x2690 ? m_show+0x1d0/0x1d0 __do_sys_finit_module+0xc5/0xd0 __x64_sys_finit_module+0x15/0x20 do_syscall_64+0x6b/0x1d0 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x7ff52e4a2839 Code: 00 f3 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 1f f6 2c 00 f7 d8 64 89 01 48 RSP: 002b:00007ffffa7b3c08 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 RAX: ffffffffffffffda RBX: 00005647560a2a00 RCX: 00007ff52e4a2839 RDX: 0000000000000000 RSI: 00005647547f3c2e RDI: 0000000000000003 RBP: 00005647547f3c2e R08: 0000000000000000 R09: 00005647560a2a00 R10: 0000000000000003 R11: 0000000000000246 R12: 0000000000000000 R13: 00005647560a2c10 R14: 0000000000040000 R15: 00005647560a2a00 Modules linked in: mac802154_hwsim(+) mac802154 [last unloaded: mac802154_hwsim]
In hwsim_add_one, if hwsim_subscribe_all_others fails, we should call ieee802154_unregister_hw to free resources.
--- drivers/net/ieee802154/mac802154_hwsim.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ieee802154/mac802154_hwsim.c +3 -1
@@ -821,7 +821,7 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev, err =hwsim_subscribe_all_others (phy);if (err <0 ) {mutex_unlock (&hwsim_phys_lock); - goto err_reg; + goto err_subscribe; } }list_add_tail (&phy->list, &hwsim_phys);
@@ -831,6 +831,8 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev,return idx; +err_subscribe: +ieee802154_unregister_hw (phy->hw); err_reg:kfree (pib); err_pib:
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/52 batman-adv: fix uninit-value in batadv_netlink_get_ifindex()
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 3ee1bb7aae97324ec9078da1f00cb2176919563f ]
batadv_netlink_get_ifindex() needs to make sure user passed a correct u32 attribute.
syzbot reported :
BUG: KMSAN: uninit-value in batadv_netlink_dump_hardif+0x70d/0x880 net/batman-adv/netlink.c:968 CPU: 1 PID: 11705 Comm: syz-executor888 Not tainted 5.1.0+ #1 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x191/0x1f0 lib/dump_stack.c:113 kmsan_report+0x130/0x2a0 mm/kmsan/kmsan.c:622 __msan_warning+0x75/0xe0 mm/kmsan/kmsan_instr.c:310 batadv_netlink_dump_hardif+0x70d/0x880 net/batman-adv/netlink.c:968 genl_lock_dumpit+0xc6/0x130 net/netlink/genetlink.c:482 netlink_dump+0xa84/0x1ab0 net/netlink/af_netlink.c:2253 __netlink_dump_start+0xa3a/0xb30 net/netlink/af_netlink.c:2361 genl_family_rcv_msg net/netlink/genetlink.c:550 [inline] genl_rcv_msg+0xfc1/0x1a40 net/netlink/genetlink.c:627 netlink_rcv_skb+0x431/0x620 net/netlink/af_netlink.c:2486 genl_rcv+0x63/0x80 net/netlink/genetlink.c:638 netlink_unicast_kernel net/netlink/af_netlink.c:1311 [inline] netlink_unicast+0xf3e/0x1020 net/netlink/af_netlink.c:1337 netlink_sendmsg+0x127e/0x12f0 net/netlink/af_netlink.c:1926 sock_sendmsg_nosec net/socket.c:651 [inline] sock_sendmsg net/socket.c:661 [inline] ___sys_sendmsg+0xcc6/0x1200 net/socket.c:2260 __sys_sendmsg net/socket.c:2298 [inline] __do_sys_sendmsg net/socket.c:2307 [inline] __se_sys_sendmsg+0x305/0x460 net/socket.c:2305 __x64_sys_sendmsg+0x4a/0x70 net/socket.c:2305 do_syscall_64+0xbc/0xf0 arch/x86/entry/common.c:291 entry_SYSCALL_64_after_hwframe+0x63/0xe7 RIP: 0033:0x440209
--- net/batman-adv/netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/netlink.c +1 -1
@@ -118,7 +118,7 @@ batadv_netlink_get_ifindex(const struct nlmsghdr *nlh, int attrtype) {struct nlattr *attr =nlmsg_find_attr (nlh,GENL_HDRLEN , attrtype); -return attr ?nla_get_u32 (attr) :0 ; +return (attr &&nla_len (attr) ==sizeof (u32)) ?nla_get_u32 (attr) :0 ; }/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 18/52 netfilter: xt_nfacct: Fix alignment mismatch in xt_nfacct_match_info
In reply to Sasha LevinFrom: Juliana Rodrigueiro <[email protected]>
[ Upstream commit 89a26cd4b501e9511d3cd3d22327fc76a75a38b3 ]
When running a 64-bit kernel with a 32-bit iptables binary, the size of the xt_nfacct_match_info struct diverges.
kernel: sizeof(struct xt_nfacct_match_info) : 40
iptables: sizeof(struct xt_nfacct_match_info)) : 36
Trying to append nfacct related rules results in an unhelpful message. Although it is suggested to look for more information in dmesg, nothing can be found there.
# iptables -A <chain> -m nfacct --nfacct-name <acct-object>
iptables: Invalid argument. Run `dmesg' for more information.This patch fixes the memory misalignment by enforcing 8-byte alignment within the struct's first revision. This solution is often used in many other uapi netfilter headers.
--- include/uapi/linux/netfilter/xt_nfacct.h | 5 ++++ net/netfilter/xt_nfacct.c | 36 ++++++++++++++++-------- 2 files changed, 30 insertions(+), 11 deletions(-)
include/uapi/linux/netfilter/xt_nfacct.h +5 -0
@@ -11,4 +11,9 @@ struct xt_nfacct_match_info { struct nf_acct *nfacct; }; +struct xt_nfacct_match_info_v1 { +char name[NFACCT_NAME_MAX ]; +struct nf_acct *nfacct __attribute__((aligned (8 ))); +}; +#endif /* _XT_NFACCT_MATCH_H */
net/netfilter/xt_nfacct.c +25 -11
@@ -57,25 +57,39 @@ nfacct_mt_destroy(const struct xt_mtdtor_param *par)nfnl_acct_put (info->nfacct); } -static struct xt_match nfacct_mt_reg__read_mostly = { - .name ="nfacct" , - .family =NFPROTO_UNSPEC , - .checkentry = nfacct_mt_checkentry, - .match = nfacct_mt, - .destroy = nfacct_mt_destroy, - .matchsize =sizeof (struct xt_nfacct_match_info ), - .usersize = offsetof(struct xt_nfacct_match_info , nfacct), - .me =THIS_MODULE , +static struct xt_match nfacct_mt_reg[]__read_mostly = { + { + .name ="nfacct" , + .revision =0 , + .family =NFPROTO_UNSPEC , + .checkentry = nfacct_mt_checkentry, + .match = nfacct_mt, + .destroy = nfacct_mt_destroy, + .matchsize =sizeof (struct xt_nfacct_match_info ), + .usersize = offsetof(struct xt_nfacct_match_info , nfacct), + .me =THIS_MODULE , + }, + { + .name ="nfacct" , + .revision =1 , + .family =NFPROTO_UNSPEC , + .checkentry = nfacct_mt_checkentry, + .match = nfacct_mt, + .destroy = nfacct_mt_destroy, + .matchsize =sizeof (struct xt_nfacct_match_info_v1 ), + .usersize = offsetof(struct xt_nfacct_match_info_v1 , nfacct), + .me =THIS_MODULE , + }, };static int __init nfacct_mt_init (void ) { -return xt_register_match (&nfacct_mt_reg); +return xt_register_matches (nfacct_mt_reg,ARRAY_SIZE (nfacct_mt_reg)); } static void __exit nfacct_mt_exit(void) { -xt_unregister_match (&nfacct_mt_reg); +xt_unregister_matches (nfacct_mt_reg,ARRAY_SIZE (nfacct_mt_reg)); }module_init (nfacct_mt_init);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/52 NFSv4: Fix return values for nfs4_file_open()
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit 90cf500e338ab3f3c0f126ba37e36fb6a9058441 ]
Currently, we are translating RPC level errors such as timeouts, as well as interrupts etc into EOPENSTALE, which forces a single replay of the open attempt. What we actually want to do is force the replay only in the cases where the returned error indicates that the file may have changed on the server.
So the fix is to spell out the exact set of errors where we want to return EOPENSTALE.
--- fs/nfs/nfs4file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/nfs/nfs4file.c +6 -6
@@ -73,13 +73,13 @@ nfs4_file_open(struct inode *inode, struct file *filp)if (IS_ERR (inode)) { err =PTR_ERR (inode);switch (err) { -case -EPERM : -case -EACCES : -case -EDQUOT : -case -ENOSPC : -case -EROFS : - goto out_put_ctx;default : + goto out_put_ctx; +case -ENOENT : +case -ESTALE : +case -EISDIR : +case -ENOTDIR : +case -ELOOP : goto out_drop; } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 23/52 xdp: unpin xdp umem pages in error path
In reply to Sasha LevinFrom: Ivan Khoronzhuk <[email protected]>
[ Upstream commit fb89c39455e4b49881c5a42761bd71f03d3ef888 ]
Fix mem leak caused by missed unpin routine for umem pages.
--- net/xdp/xdp_umem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/xdp/xdp_umem.c +3 -1
@@ -322,7 +322,7 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) umem->pages =kcalloc (umem->npgs,sizeof (*umem->pages),GFP_KERNEL );if (!umem->pages) { err = -ENOMEM ; - goto out_account; + goto out_pin; }for (i =0 ; i < umem->npgs; i++)
@@ -330,6 +330,8 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)return 0 ; +out_pin: +xdp_umem_unpin_pages (umem); out_account:xdp_umem_unaccount_pages (umem);return err;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 20/52 NFSv4: Fix return value in nfs_finish_open()
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit 9821421a291b548ef4369c6998745baa36ddecd5 ]
If the file turns out to be of the wrong type after opening, we want to revalidate the path and retry, so return EOPENSTALE rather than ESTALE.
--- fs/nfs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/dir.c +1 -1
@@ -1486,7 +1486,7 @@ static int nfs_finish_open(struct nfs_open_context *ctx,if (S_ISREG (file->f_path.dentry->d_inode->i_mode))nfs_file_set_open_context (file, ctx);else - err = -ESTALE ; + err = -EOPENSTALE ; out:return err; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 27/52 batman-adv: Only read OGM2 tvlv_len after buffer len check
In reply to Sasha LevinFrom: Sven Eckelmann <[email protected]>
[ Upstream commit 0ff0f15a32c093381ad1abc06abe85afb561ab28 ]
Multiple batadv_ogm2_packet can be stored in an skbuff. The functions batadv_v_ogm_send_to_if() uses batadv_v_ogm_aggr_packet() to check if there is another additional batadv_ogm2_packet in the skb or not before they continue processing the packet.
The length for such an OGM2 is BATADV_OGM2_HLEN + batadv_ogm2_packet->tvlv_len. The check must first check that at least BATADV_OGM2_HLEN bytes are available before it accesses tvlv_len (which is part of the header. Otherwise it might try read outside of the currently available skbuff to get the content of tvlv_len.
--- net/batman-adv/bat_v_ogm.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
net/batman-adv/bat_v_ogm.c +12 -6
@@ -643,17 +643,23 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv,* batadv_v_ogm_aggr_packet() - checks if there is another OGM aggregated * @buff_pos: current position in the skb * @packet_len: total length of the skb -* @tvlv_len: tvlv length of the previously considered OGM +* @ogm2_packet: potential OGM2 in buffer * * Return: true if there is enough space for another OGM, false otherwise. */ -static bool batadv_v_ogm_aggr_packet (int buff_pos,int packet_len, -__be16 tvlv_len) +static bool +batadv_v_ogm_aggr_packet (int buff_pos,int packet_len, +const struct batadv_ogm2_packet *ogm2_packet) {int next_buff_pos =0 ; - next_buff_pos += buff_pos +BATADV_OGM2_HLEN ; - next_buff_pos +=ntohs (tvlv_len); +/* check if there is enough space for the header */ + next_buff_pos += buff_pos +sizeof (*ogm2_packet); +if (next_buff_pos > packet_len) +return false; + +/* check if there is enough space for the optional TVLV */ + next_buff_pos +=ntohs (ogm2_packet->tvlv_len);return (next_buff_pos <= packet_len) && (next_buff_pos <=BATADV_MAX_AGGREGATION_BYTES );
@@ -830,7 +836,7 @@ int batadv_v_ogm_packet_recv(struct sk_buff *skb, ogm_packet = (struct batadv_ogm2_packet *)skb->data;while (batadv_v_ogm_aggr_packet (ogm_offset,skb_headlen (skb), - ogm_packet->tvlv_len)) { + ogm_packet)) {batadv_v_ogm_process (skb, ogm_offset, if_incoming); ogm_offset +=BATADV_OGM2_HLEN ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 28/52 bpf: allow narrow loads of some sk_reuseport_md fields with offset > 0
In reply to Sasha LevinFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit 2c238177bd7f4b14bdf7447cc1cd9bb791f147e6 ]
test_select_reuseport fails on s390 due to verifier rejecting test_select_reuseport_kern.o with the following message:
; data_check.eth_protocol = reuse_md->eth_protocol; 18: (69) r1 = *(u16 *)(r6 +22) invalid bpf_context access off=22 size=2
This is because on big-endian machines casts from __u32 to __u16 are generated by referencing the respective variable as __u16 with an offset of 2 (as opposed to 0 on little-endian machines).
The verifier already has all the infrastructure in place to allow such accesses, it's just that they are not explicitly enabled for eth_protocol field. Enable them for eth_protocol field by using bpf_ctx_range instead of offsetof.
Ditto for ip_protocol, bind_inany and len, since they already allow narrowing, and the same problem can arise when working with them.
--- net/core/filter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/core/filter.c +4 -4
@@ -7234,13 +7234,13 @@ sk_reuseport_is_valid_access(int off, int size,return size == size_default;/* Fields that allow narrowing */ -case offsetof(struct sk_reuseport_md , eth_protocol): + case bpf_ctx_range(struct sk_reuseport_md, eth_protocol): if (size < FIELD_SIZEOF(struct sk_buff, protocol))return false;/* fall through */ -case offsetof(struct sk_reuseport_md , ip_protocol): -case offsetof(struct sk_reuseport_md , bind_inany): -case offsetof(struct sk_reuseport_md , len): + case bpf_ctx_range(struct sk_reuseport_md, ip_protocol): + case bpf_ctx_range(struct sk_reuseport_md, bind_inany): + case bpf_ctx_range(struct sk_reuseport_md, len):bpf_ctx_record_field_size (info, size_default);return bpf_ctx_narrow_access_ok (off, size, size_default);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 29/52 r8152: Set memory to all 0xFFs on failed reg reads
In reply to Sasha LevinFrom: Prashant Malani <[email protected]>
[ Upstream commit f53a7ad189594a112167efaf17ea8d0242b5ac00 ]
get_registers() blindly copies the memory written to by the usb_control_msg() call even if the underlying urb failed.
This could lead to junk register values being read by the driver, since some indirect callers of get_registers() ignore the return values. One example is:
ocp_read_dword() ignores the return value of generic_ocp_read(), which calls get_registers().
So, emulate PCI "Master Abort" behavior by setting the buffer to all 0xFFs when usb_control_msg() fails.
This patch is copied from the r8152 driver (v2.12.0) published by Realtek (www.realtek.com).
--- drivers/net/usb/r8152.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/usb/r8152.c +4 -1
@@ -788,8 +788,11 @@ int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data) ret =usb_control_msg (tp->udev,usb_rcvctrlpipe (tp->udev,0 ),RTL8152_REQ_GET_REGS ,RTL8152_REQT_READ , value, index, tmp, size,500 ); +if (ret <0 ) +memset (data,0xff , size); +else +memcpy (data, tmp, size); -memcpy (data, tmp, size);kfree (tmp);return ret;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 25/52 ARM: 8874/1: mm: only adjust sections of valid mm structures
In reply to Sasha LevinFrom: Doug Berger <[email protected]>
[ Upstream commit c51bc12d06b3a5494fbfcbd788a8e307932a06e9 ]
A timing hazard exists when an early fork/exec thread begins exiting and sets its mm pointer to NULL while a separate core tries to update the section information.
This commit ensures that the mm pointer is not NULL before setting its section parameters. The arguments provided by commit 11ce4b33aedc ("ARM: 8672/1: mm: remove tasklist locking from update_sections_early()") are equally valid for not requiring grabbing the task_lock around this check.
--- arch/arm/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mm/init.c +2 -1
@@ -713,7 +713,8 @@ static void update_sections_early(struct section_perm perms[], int n)if (t->flags &PF_KTHREAD )continue ;for_each_thread (t, s) -set_section_perms (perms, n, true, s->mm); +if (s->mm) +set_section_perms (perms, n, true, s->mm); }set_section_perms (perms, n, true, current->active_mm);set_section_perms (perms, n, true, &init_mm);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 30/52 x86/apic: Fix arch_dynirq_lower_bound() bug for DT enabled machines
In reply to Sasha LevinFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 3e5bedc2c258341702ddffbd7688c5e6eb01eafa ]
Rahul Tanwar reported the following bug on DT systems:
Quoted 11 lines
'
ioapic_dynirq_base' contains the virtual IRQ base number. Presently, it is updated to the end of hardware IRQ numbers but this is done only when IOAPIC configuration type isIOAPIC_DOMAIN_LEGACYorIOAPIC_DOMAIN_STRICT. There is a third typeIOAPIC_DOMAIN_DYNAMICwhich applies when IOAPIC configuration comes from devicetree.See
dtb_add_ioapic()inarch/x86/kernel/devicetree.cIn case of
IOAPIC_DOMAIN_DYNAMIC(DT/OF based system), 'ioapic_dynirq_base' remains to zero initialized value. This means that for OF based systems, virtual IRQ base will get set to zero.
Such systems will very likely not even boot.
For DT enabled machines ioapic_dynirq_base is irrelevant and not updated, so simply map the IRQ base 1:1 instead.
--- arch/x86/kernel/apic/io_apic.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/x86/kernel/apic/io_apic.c +7 -1
@@ -2432,7 +2432,13 @@ unsigned int arch_dynirq_lower_bound(unsigned int from)* dmar_alloc_hwirq() may be called before setup_IO_APIC(), so use * gsi_top if ioapic_dynirq_base hasn't been initialized yet. */ -return ioapic_initialized ? ioapic_dynirq_base : gsi_top; +if (!ioapic_initialized) +return gsi_top; +/* +* For DT enabled machines ioapic_dynirq_base is irrelevant and not +* updated. So simply return @from if ioapic_dynirq_base == 0. +*/ +return ioapic_dynirq_base ? : from; }#ifdef CONFIG_X86_32
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 40/52 ARM: 8901/1: add a criteria for pfn_valid of arm
In reply to Sasha LevinFrom: zhaoyang <[email protected]>
[ Upstream commit 5b3efa4f1479c91cb8361acef55f9c6662feba57 ]
pfn_valid can be wrong when parsing a invalid pfn whose phys address exceeds BITS_PER_LONG as the MSB will be trimed when shifted.
The issue originally arise from bellowing call stack, which corresponding to an access of the /proc/kpageflags from userspace with a invalid pfn parameter and leads to kernel panic.
[46886.723249] c7 [<c031ff98>] (stable_page_flags) from [<c03203f8>] [46886.723264] c7 [<c0320368>] (kpageflags_read) from [<c0312030>] [46886.723280] c7 [<c0311fb0>] (proc_reg_read) from [<c02a6e6c>] [46886.723290] c7 [<c02a6e24>] (__vfs_read) from [<c02a7018>] [46886.723301] c7 [<c02a6f74>] (vfs_read) from [<c02a778c>] [46886.723315] c7 [<c02a770c>] (SyS_pread64) from [<c0108620>]
(ret_fast_syscall+0x0/0x28)
--- arch/arm/mm/init.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/mm/init.c +5 -0
@@ -196,6 +196,11 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low,#ifdef CONFIG_HAVE_ARCH_PFN_VALID int pfn_valid (unsigned long pfn) { +phys_addr_t addr =__pfn_to_phys (pfn); + +if (__phys_to_pfn (addr) != pfn) +return 0 ; +return memblock_is_map_memory (__pfn_to_phys (pfn)); }EXPORT_SYMBOL (pfn_valid);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 41/52 ibmvnic: Do not process reset during or after device removal
In reply to Sasha LevinFrom: Thomas Falcon <[email protected]>
[ Upstream commit 36f1031c51a2538e5558fb44c6d6b88f98d3c0f2 ]
Currently, the ibmvnic driver will not schedule device resets if the device is being removed, but does not check the device state before the reset is actually processed. This leads to a race where a reset is scheduled with a valid device state but is processed after the driver has been removed, resulting in an oops.
Fix this by checking the device state before processing a queued reset event.
--- drivers/net/ethernet/ibm/ibmvnic.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/ibm/ibmvnic.c +5 -1
@@ -1996,6 +1996,10 @@ static void __ibmvnic_reset(struct work_struct *work) rwi =get_next_rwi (adapter);while (rwi) { +if (adapter->state ==VNIC_REMOVING || + adapter->state ==VNIC_REMOVED ) + goto out; +if (adapter->force_reset_recovery) { adapter->force_reset_recovery = false; rc =do_hard_reset (adapter, rwi, reset_state);
@@ -2020,7 +2024,7 @@ static void __ibmvnic_reset(struct work_struct *work)netdev_dbg (adapter->netdev,"Reset failed\n" );free_all_rwi (adapter); } - +out: adapter->resetting = false;if (we_lock_rtnl)rtnl_unlock ();
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 42/52 sky2: Disable MSI on yet another ASUS boards (P6Xxxx)
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 189308d5823a089b56e2299cd96589507dac7319 ]
A similar workaround for the suspend/resume problem is needed for yet another ASUS machines, P6X models. Like the previous fix, the BIOS doesn't provide the standard DMI_SYS_* entry, so again DMI_BOARD_* entries are used instead.
--- drivers/net/ethernet/marvell/sky2.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/marvell/sky2.c +7 -0
@@ -4954,6 +4954,13 @@ static const struct dmi_system_id msi_blacklist[] = { DMI_MATCH(DMI_BOARD_NAME, "P6T"), }, }, + { + .ident = "ASUS P6X", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "P6X"), + }, + }, {} };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 34/52 NFSv2: Fix write regression
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit d33d4beb522987d1c305c12500796f9be3687dee ]
Ensure we update the write result count on success, since the RPC call itself does not do so.
--- fs/nfs/proc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/nfs/proc.c +3 -1
@@ -616,8 +616,10 @@ static int nfs_proc_pgio_rpc_prepare(struct rpc_task *task,static int nfs_write_done (struct rpc_task *task,struct nfs_pgio_header *hdr) { -if (task->tk_status >=0 ) +if (task->tk_status >=0 ) { + hdr->res.count = hdr->args.count;nfs_writeback_update_inode (hdr); + }return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 37/52 cifs: Use kzfree() to zero out the password
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 478228e57f81f6cb60798d54fc02a74ea7dd267e ]
It's safer to zero out the password so that it can never be disclosed.
--- fs/cifs/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/connect.c +1 -1
@@ -2876,7 +2876,7 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses) rc = -ENOMEM ;kfree (vol->username); vol->username =NULL ; -kfree (vol->password); +kzfree (vol->password); vol->password =NULL ; goto out_key_put; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 47/52 net: stmmac: dwmac-rk: Don't fail if phy regulator is absent
In reply to Sasha LevinFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 3b25528e1e355c803e73aa326ce657b5606cda73 ]
The devicetree binding lists the phy phy as optional. As such, the driver should not bail out if it can't find a regulator. Instead it should just skip the remaining regulator related code and continue on normally.
Skip the remainder of phy_power_on() if a regulator supply isn't available. This also gets rid of the bogus return code.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +2 -4
@@ -1203,10 +1203,8 @@ static int phy_power_on(struct rk_priv_data *bsp_priv, bool enable)int ret;struct device *dev = &bsp_priv->pdev->dev; -if (!ldo) { -dev_err (dev,"no regulator found\n" ); -return -1 ; - } +if (!ldo) +return 0 ;if (enable) { ret =regulator_enable (ldo);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 48/52 tools/power x86_energy_perf_policy: Fix "uninitialized variable" warnings at -O2
In reply to Sasha LevinFrom: Ben Hutchings <[email protected]>
[ Upstream commit adb8049097a9ec4acd09fbd3aa8636199a78df8a ]
x86_energy_perf_policy first uses __get_cpuid() to check the maximum CPUID level and exits if it is too low. It then assumes that later calls will succeed (which I think is architecturally guaranteed). It also assumes that CPUID works at all (which is not guaranteed on x86_32).
If optimisations are enabled, gcc warns about potentially uninitialized variables. Fix this by adding an exit-on-error after every call to __get_cpuid() instead of just checking the maximum level.
--- .../x86_energy_perf_policy.c | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-)
tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c +15 -11
@@ -1260,6 +1260,15 @@ void probe_dev_msr(void)if (system ("/sbin/modprobe msr > /dev/null 2>&1" ))err (-5 ,"no /dev/cpu/0/msr, Try \"# modprobe msr\" " ); } + +static void get_cpuid_or_exit (unsigned int leaf, +unsigned int *eax,unsigned int *ebx, +unsigned int *ecx,unsigned int *edx) +{ +if (!__get_cpuid (leaf, eax, ebx, ecx, edx)) +errx (1 ,"Processor not supported\n" ); +} +/* * early_cpuid() * initialize turbo_is_enabled, has_hwp, has_epb
@@ -1267,15 +1276,10 @@ void probe_dev_msr(void)*/ void early_cpuid (void ) { -unsigned int eax, ebx, ecx, edx, max_level; +unsigned int eax, ebx, ecx, edx;unsigned int fms, family, model; -__get_cpuid (0 , &max_level, &ebx, &ecx, &edx); - -if (max_level <6 ) -errx (1 ,"Processor not supported\n" ); - -__get_cpuid (1 , &fms, &ebx, &ecx, &edx); +get_cpuid_or_exit (1 , &fms, &ebx, &ecx, &edx); family = (fms >>8 ) &0xf ; model = (fms >>4 ) &0xf ;if (family ==6 || family ==0xf )
@@ -1289,7 +1293,7 @@ void early_cpuid(void) bdx_highest_ratio = msr &0xFF ; } -__get_cpuid (0x6 , &eax, &ebx, &ecx, &edx); +get_cpuid_or_exit (0x6 , &eax, &ebx, &ecx, &edx); turbo_is_enabled = (eax >>1 ) &1 ; has_hwp = (eax >>7 ) &1 ; has_epb = (ecx >>3 ) &1 ;
@@ -1307,7 +1311,7 @@ void parse_cpuid(void) eax = ebx = ecx = edx =0 ; -__get_cpuid (0 , &max_level, &ebx, &ecx, &edx); +get_cpuid_or_exit (0 , &max_level, &ebx, &ecx, &edx);if (ebx ==0x756e6547 && edx ==0x49656e69 && ecx ==0x6c65746e ) genuine_intel =1 ;
@@ -1316,7 +1320,7 @@ void parse_cpuid(void)fprintf (stderr,"CPUID(0): %.4s%.4s%.4s " , (char *)&ebx, (char *)&edx, (char *)&ecx); -__get_cpuid (1 , &fms, &ebx, &ecx, &edx); +get_cpuid_or_exit (1 , &fms, &ebx, &ecx, &edx); family = (fms >>8 ) &0xf ; model = (fms >>4 ) &0xf ; stepping = fms &0xf ;
@@ -1341,7 +1345,7 @@ void parse_cpuid(void)errx (1 ,"CPUID: no MSR" ); -__get_cpuid (0x6 , &eax, &ebx, &ecx, &edx); +get_cpuid_or_exit (0x6 , &eax, &ebx, &ecx, &edx);/* turbo_is_enabled already set */ /* has_hwp already set */ has_hwp_notify = eax & (1 <<8 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 44/52 perf/x86/intel: Restrict period on Nehalem
In reply to Sasha LevinFrom: Josh Hunt <[email protected]>
[ Upstream commit 44d3bbb6f5e501b873218142fe08cdf62a4ac1f3 ]
We see our Nehalem machines reporting 'perfevents: irq loop stuck!' in some cases when using perf:
perfevents: irq loop stuck!
WARNING: CPU: 0 PID: 3485 at arch/x86/events/intel/core.c:2282 intel_pmu_handle_irq+0x37b/0x530 ... RIP: 0010:intel_pmu_handle_irq+0x37b/0x530 ... Call Trace: <NMI> ? perf_event_nmi_handler+0x2e/0x50 ? intel_pmu_save_and_restart+0x50/0x50 perf_event_nmi_handler+0x2e/0x50 nmi_handle+0x6e/0x120 default_do_nmi+0x3e/0x100 do_nmi+0x102/0x160 end_repeat_nmi+0x16/0x50 ... ? native_write_msr+0x6/0x20 ? native_write_msr+0x6/0x20 </NMI> intel_pmu_enable_event+0x1ce/0x1f0 x86_pmu_start+0x78/0xa0 x86_pmu_enable+0x252/0x310 __perf_event_task_sched_in+0x181/0x190 ? __switch_to_asm+0x41/0x70 ? __switch_to_asm+0x35/0x70 ? __switch_to_asm+0x41/0x70 ? __switch_to_asm+0x35/0x70 finish_task_switch+0x158/0x260 __schedule+0x2f6/0x840 ? hrtimer_start_range_ns+0x153/0x210 schedule+0x32/0x80 schedule_hrtimeout_range_clock+0x8a/0x100 ? hrtimer_init+0x120/0x120 ep_poll+0x2f7/0x3a0 ? wake_up_q+0x60/0x60 do_epoll_wait+0xa9/0xc0 __x64_sys_epoll_wait+0x1a/0x20 do_syscall_64+0x4e/0x110 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fdeb1e96c03
...
--- arch/x86/events/intel/core.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/events/intel/core.c +6 -0
@@ -3319,6 +3319,11 @@ static u64 bdw_limit_period(struct perf_event *event, u64 left)return left; } +static u64 nhm_limit_period (struct perf_event *event,u64 left) +{ +return max (left,32ULL ); +} +PMU_FORMAT_ATTR (event,"config:0-7" );PMU_FORMAT_ATTR (umask,"config:8-15" );PMU_FORMAT_ATTR (edge,"config:18" );
@@ -4115,6 +4120,7 @@ __init int intel_pmu_init(void) x86_pmu.pebs_constraints = intel_nehalem_pebs_event_constraints; x86_pmu.enable_all = intel_pmu_nhm_enable_all; x86_pmu.extra_regs = intel_nehalem_extra_regs; + x86_pmu.limit_period = nhm_limit_period; x86_pmu.cpu_events = nhm_events_attrs;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 49/52 tools/power x86_energy_perf_policy: Fix argument parsing
In reply to Sasha LevinFrom: "Zephaniah E. Loss-Cutler-Hull" <[email protected]>
[ Upstream commit 03531482402a2bc4ab93cf6dde46833775e035e9 ]
The -w argument in x86_energy_perf_policy currently triggers an unconditional segfault.
This is because the argument string reads: "+a:c:dD:E:e:f:m:M:rt:u:vw" and yet the argument handler expects an argument.
When parse_optarg_string is called with a null argument, we then proceed to crash in strncmp, not horribly friendly.
The man page describes -w as taking an argument, the long form (--hwp-window) is correctly marked as taking a required argument, and the code expects it.
As such, this patch simply marks the short form (-w) as requiring an argument.
--- tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c +1 -1
@@ -546,7 +546,7 @@ void cmdline(int argc, char **argv) progname = argv[0 ]; -while ((opt =getopt_long_only (argc, argv,"+a:c:dD:E:e:f:m:M:rt:u:vw" , +while ((opt =getopt_long_only (argc, argv,"+a:c:dD:E:e:f:m:M:rt:u:vw:" , long_options, &option_index)) !=-1 ) {switch (opt) {case 'a' :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 50/52 tools/power turbostat: fix buffer overrun
In reply to Sasha LevinFrom: Naoya Horiguchi <[email protected]>
[ Upstream commit eeb71c950bc6eee460f2070643ce137e067b234c ]
turbostat could be terminated by general protection fault on some latest hardwares which (for example) support 9 levels of C-states and show 18 "tADDED" lines. That bloats the total output and finally causes buffer overrun. So let's extend the buffer to avoid this.
--- tools/power/x86/turbostat/turbostat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/power/x86/turbostat/turbostat.c +1 -1
@@ -4953,7 +4953,7 @@ int initialize_counters(int cpu_id)void allocate_output_buffer () { - output_buffer =calloc (1 , (1 + topo.num_cpus) *1024 ); + output_buffer =calloc (1 , (1 + topo.num_cpus) *2048 ); outp = output_buffer;if (outp ==NULL )err (-1 ,"calloc output buffer" );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 52/52 net: seeq: Fix the function used to release some memory in an error handling path
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit e1e54ec7fb55501c33b117c111cb0a045b8eded2 ]
In commit 99cd149efe82 ("sgiseeq: replace use of dma_cache_wback_inv"), a call to 'get_zeroed_page()' has been turned into a call to 'dma_alloc_coherent()'. Only the remove function has been updated to turn the corresponding 'free_page()' into 'dma_free_attrs()'.
The error hndling path of the probe function has not been updated.
Fix it now.
Rename the corresponding label to something more in line.
--- drivers/net/ethernet/seeq/sgiseeq.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/seeq/sgiseeq.c +4 -3
@@ -793,15 +793,16 @@ static int sgiseeq_probe(struct platform_device *pdev)printk (KERN_ERR "Sgiseeq: Cannot register net device, " "aborting.\n" ); err = -ENODEV ; - goto err_out_free_page; + goto err_out_free_attrs; }printk (KERN_INFO "%s: %s %pM\n" , dev->name, sgiseeqstr, dev->dev_addr);return 0 ; -err_out_free_page: -free_page ((unsigned long ) sp->srings); +err_out_free_attrs: +dma_free_attrs (&pdev->dev,sizeof (*sp->srings), sp->srings, + sp->srings_dma,DMA_ATTR_NON_CONSISTENT ); err_out_free_dev:free_netdev (dev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 51/52 net: aquantia: fix out of memory condition on rx side
In reply to Sasha LevinFrom: Dmitry Bogdanov <[email protected]>
[ Upstream commit be6cef69ba570ebb327eba1ef6438f7af49aaf86 ]
On embedded environments with hard memory limits it is a normal although rare case when skb can't be allocated on rx part under high traffic.
In such OOM cases napi_complete_done() was not called.
So the napi object became in an invalid state like it is "scheduled". Kernel do not re-schedules the poll of that napi object.
Consequently, kernel can not remove that object the system hangs on ifconfig down waiting for a poll.
We are fixing this by gracefully closing napi poll routine with correct invocation of napi_complete_done.
This was reproduced with artificially failing the allocation of skb to simulate an "out of memory" error case and check that traffic does not get stuck.
--- drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/aquantia/atlantic/aq_vec.c +2 -1
@@ -89,6 +89,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget) } } +err_exit:if (!was_tx_cleaned) work_done = budget;
@@ -98,7 +99,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget) 1U << self->aq_ring_param.vec_idx); } } -err_exit: +return work_done; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 46/52 amd-xgbe: Fix error path in xgbe_mod_init()
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit b6b4dc4c1fa7f1c99398e7dc85758049645e9588 ]
In xgbe_mod_init(), we should do cleanup if some error occurs
--- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/ethernet/amd/xgbe/xgbe-main.c +8 -2
@@ -469,13 +469,19 @@ static int __init xgbe_mod_init(void) ret =xgbe_platform_init ();if (ret) -return ret; + goto err_platform_init; ret =xgbe_pci_init ();if (ret) -return ret; + goto err_pci_init;return 0 ; + +err_pci_init: +xgbe_platform_exit (); +err_platform_init: +unregister_netdevice_notifier (&xgbe_netdev_notifier); +return ret; } static void __exit xgbe_mod_exit(void)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 45/52 perf/x86/amd/ibs: Fix sample bias for dispatched micro-ops
In reply to Sasha LevinFrom: Kim Phillips <[email protected]>
[ Upstream commit 0f4cd769c410e2285a4e9873a684d90423f03090 ]
When counting dispatched micro-ops with cnt_ctl=1, in order to prevent sample bias, IBS hardware preloads the least significant 7 bits of current count (IbsOpCurCnt) with random values, such that, after the interrupt is handled and counting resumes, the next sample taken will be slightly perturbed.
The current count bitfield is in the IBS execution control h/w register, alongside the maximum count field.
Currently, the IBS driver writes that register with the maximum count, leaving zeroes to fill the current count field, thereby overwriting the random bits the hardware preloaded for itself.
Fix the driver to actually retain and carry those random bits from the read of the IBS control register, through to its write, instead of overwriting the lower current count bits with zeroes.
Tested with:
perf record -c 100001 -e ibs_op/cnt_ctl=1/pp -a -C 0 taskset -c 0 <workload>
'perf annotate' output before:
15.70 65: addsd %xmm0,%xmm1
17.30 add $0x1,%rax
15.88 cmp %rdx,%rax
je 82
17.32 72: test $0x1,%al
jne 7c
7.52 movapd %xmm1,%xmm0
5.90 jmp 65
8.23 7c: sqrtsd %xmm1,%xmm0
12.15 jmp 65'perf annotate' output after:
16.63 65: addsd %xmm0,%xmm1
16.82 add $0x1,%rax
16.81 cmp %rdx,%rax
je 82
16.69 72: test $0x1,%al
jne 7c
8.30 movapd %xmm1,%xmm0
8.13 jmp 65
8.24 7c: sqrtsd %xmm1,%xmm0
8.39 jmp 65Tested on Family 15h and 17h machines.
Machines prior to family 10h Rev. C don't have the RDWROPCNT capability, and have the IbsOpCurCnt bitfield reserved, so this patch shouldn't affect their operation.
It is unknown why commit db98c5faf8cb ("perf/x86: Implement 64-bit counter support for IBS") ignored the lower 4 bits of the IbsOpCurCnt field; the number of preloaded random bits has always been 7, AFAICT.
--- arch/x86/events/amd/ibs.c | 13 ++++++++++--- arch/x86/include/asm/perf_event.h | 12 ++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-)
arch/x86/events/amd/ibs.c +10 -3
@@ -672,10 +672,17 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs) throttle =perf_event_overflow (event, &data, ®s); out: -if (throttle) +if (throttle) {perf_ibs_stop (event,0 ); -else -perf_ibs_enable_event (perf_ibs, hwc, period >>4 ); + }else { + period >>=4 ; + +if ((ibs_caps &IBS_CAPS_RDWROPCNT ) && + (*config &IBS_OP_CNT_CTL )) + period |= *config &IBS_OP_CUR_CNT_RAND ; + +perf_ibs_enable_event (perf_ibs, hwc, period); + }perf_event_update_userpage (event);
arch/x86/include/asm/perf_event.h +8 -4
@@ -209,16 +209,20 @@ struct x86_pmu_capability {#define IBSCTL_LVT_OFFSET_VALID (1ULL<<8)#define IBSCTL_LVT_OFFSET_MASK 0x0F -/* ibs fetch bits/masks */ +/* IBS fetch bits/masks */ #define IBS_FETCH_RAND_EN (1ULL<<57)#define IBS_FETCH_VAL (1ULL<<49)#define IBS_FETCH_ENABLE (1ULL<<48)#define IBS_FETCH_CNT 0xFFFF0000ULL#define IBS_FETCH_MAX_CNT 0x0000FFFFULL -/* ibs op bits/masks */ -/* lower 4 bits of the current count are ignored: */ -#define IBS_OP_CUR_CNT (0xFFFF0ULL<<32) +/* +* IBS op bits/masks +* The lower 7 bits of the current count are random bits +* preloaded by hardware and ignored in software +*/ +#define IBS_OP_CUR_CNT (0xFFF80ULL<<32) +#define IBS_OP_CUR_CNT_RAND (0x0007FULL<<32)#define IBS_OP_CNT_CTL (1ULL<<19)#define IBS_OP_VAL (1ULL<<18)#define IBS_OP_ENABLE (1ULL<<17)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 31/52 netfilter: xt_physdev: Fix spurious error message in physdev_mt_check
In reply to Sasha LevinFrom: Todd Seidelmann <[email protected]>
[ Upstream commit 3cf2f450fff304be9cf4868bf0df17f253bc5b1c ]
Simplify the check in physdev_mt_check() to emit an error message only when passed an invalid chain (ie, NF_INET_LOCAL_OUT). This avoids cluttering up the log with errors against valid rules.
For large/heavily modified rulesets, current behavior can quickly overwhelm the ring buffer, because this function gets called on every change, regardless of the rule that was changed.
--- net/netfilter/xt_physdev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/netfilter/xt_physdev.c +2 -4
@@ -104,11 +104,9 @@ static int physdev_mt_check(const struct xt_mtchk_param *par)if (info->bitmask & (XT_PHYSDEV_OP_OUT |XT_PHYSDEV_OP_ISOUT ) && (!(info->bitmask &XT_PHYSDEV_OP_BRIDGED ) || info->invert &XT_PHYSDEV_OP_BRIDGED ) && - par->hook_mask & ((1 <<NF_INET_LOCAL_OUT ) | - (1 <<NF_INET_FORWARD ) | (1 <<NF_INET_POST_ROUTING ))) { + par->hook_mask & (1 <<NF_INET_LOCAL_OUT )) {pr_info_ratelimited ("--physdev-out and --physdev-is-out only supported in the FORWARD and POSTROUTING chains with bridged traffic\n" ); -if (par->hook_mask & (1 <<NF_INET_LOCAL_OUT )) -return -EINVAL ; +return -EINVAL ; }if (!brnf_probed) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 36/52 cifs: set domainName when a domain-key is used in multiuser
In reply to Sasha LevinFrom: Ronnie Sahlberg <[email protected]>
[ Upstream commit f2aee329a68f5a907bcff11a109dfe17c0b41aeb ]
RHBZ: 1710429
When we use a domain-key to authenticate using multiuser we must also set the domainnmame for the new volume as it will be used and passed to the server in the NTLMSSP Domain-name.
--- fs/cifs/connect.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
fs/cifs/connect.c +22 -0
@@ -2756,6 +2756,7 @@ static int cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses) { int rc = 0; +int is_domain =0 ;const char *delim, *payload;char *desc;ssize_t len;
@@ -2803,6 +2804,7 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses) rc =PTR_ERR (key); goto out_err; } + is_domain =1 ; }down_read (&key->sem);
@@ -2860,6 +2862,26 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses) goto out_key_put; } +/* +* If we have a domain key then we must set the domainName in the +* for the request. +*/ +if (is_domain && ses->domainName) { + vol->domainname =kstrndup (ses->domainName, +strlen (ses->domainName), +GFP_KERNEL ); +if (!vol->domainname) { +cifs_dbg (FYI ,"Unable to allocate %zd bytes for " +"domain\n" , len); + rc = -ENOMEM ; +kfree (vol->username); + vol->username =NULL ; +kfree (vol->password); + vol->password =NULL ; + goto out_key_put; + } + } + out_key_put:up_read (&key->sem);key_put (key);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 38/52 x86/build: Add -Wnoaddress-of-packed-member to REALMODE_CFLAGS, to silence GCC9 build warning
In reply to Sasha LevinFrom: Linus Torvalds <[email protected]>
[ Upstream commit 42e0e95474fc6076b5cd68cab8fa0340a1797a72 ]
One of the very few warnings I have in the current build comes from arch/x86/boot/edd.c, where I get the following with a gcc9 build:
arch/x86/boot/edd.c: In function ‘query_edd’:
arch/x86/boot/edd.c:148:11: warning: taking address of packed member of ‘struct boot_params’ may result in an unaligned pointer value [-Waddress-of-packed-member]
148 | mbrptr = boot_params.edd_mbr_sig_buffer;
| ^~~~~~~~~~~This warning triggers because we throw away all the CFLAGS and then make a new set for REALMODE_CFLAGS, so the -Wno-address-of-packed-member we added in the following commit is not present:
6f303d60534c ("gcc-9: silence 'address-of-packed-member' warning")
The simplest solution for now is to adjust the warning for this version of CFLAGS as well, but it would definitely make sense to examine whether REALMODE_CFLAGS could be derived from CFLAGS, so that it picks up changes in the compiler flags environment automatically.
--- arch/x86/Makefile | 1 + 1 file changed, 1 insertion(+)
arch/x86/Makefile +1 -0
@@ -38,6 +38,7 @@ REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -DDISABLE_BRANCH_PROFILING \ REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -ffreestanding) REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -fno-stack-protector) +REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -Wno-address-of-packed-member) REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), $(cc_stack_align4)) export REALMODE_CFLAGS
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 35/52 kallsyms: Don't let kallsyms_lookup_size_offset() fail on retrieving the first symbol
In reply to Sasha LevinFrom: Marc Zyngier <[email protected]>
[ Upstream commit 2a1a3fa0f29270583f0e6e3100d609e09697add1 ]
An arm64 kernel configured with
CONFIG_KPROBES=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
CONFIG_KALLSYMS_BASE_RELATIVE=y
reports the following kprobe failure:
[ 0.032677] kprobes: failed to populate blacklist: -22 [ 0.033376] Please take care of using kprobes.
It appears that kprobe fails to retrieve the symbol at address 0xffff000010081000, despite this symbol being in System.map:
ffff000010081000 T __exception_text_start
This symbol is part of the first group of aliases in the kallsyms_offsets array (symbol names generated using ugly hacks in scripts/kallsyms.c):
kallsyms_offsets:
.long 0x1000 // do_undefinstr
.long 0x1000 // efi_header_end
.long 0x1000 // _stext
.long 0x1000 // __exception_text_start
.long 0x12b0 // do_cp15instrLooking at the implementation of get_symbol_pos(), it returns the lowest index for aliasing symbols. In this case, it return 0.
But kallsyms_lookup_size_offset() considers 0 as a failure, which is obviously wrong (there is definitely a valid symbol living there). In turn, the kprobe blacklisting stops abruptly, hence the original error.
A CONFIG_KALLSYMS_ALL kernel wouldn't fail as there is always some random symbols at the beginning of this array, which are never looked up via kallsyms_lookup_size_offset.
Fix it by considering that get_symbol_pos() is always successful (which is consistent with the other uses of this function).
--- kernel/kallsyms.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/kallsyms.c +4 -2
@@ -262,8 +262,10 @@ int kallsyms_lookup_size_offset(unsigned long addr, unsigned long *symbolsize, {char namebuf[KSYM_NAME_LEN ]; -if (is_ksym_addr (addr)) -return !!get_symbol_pos (addr, symbolsize, offset); +if (is_ksym_addr (addr)) { +get_symbol_pos (addr, symbolsize, offset); +return 1 ; + }return !!module_address_lookup (addr, symbolsize, offset,NULL , namebuf) || !!__bpf_address_lookup (addr, symbolsize, offset, namebuf); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 33/52 NFSv2: Fix eof handling
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit 71affe9be45a5c60b9772e1b2701710712637274 ]
If we received a reply from the server with a zero length read and no error, then that implies we are at eof.
--- fs/nfs/proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nfs/proc.c +2 -1
@@ -594,7 +594,8 @@ static int nfs_read_done(struct rpc_task *task, struct nfs_pgio_header *hdr)/* Emulate the eof flag, which isn't normally needed in NFSv2 * as it is guaranteed to always return the file attributes */ -if (hdr->args.offset + hdr->res.count >= hdr->res.fattr->size) +if ((hdr->res.count ==0 && hdr->args.count >0 ) || + hdr->args.offset + hdr->res.count >= hdr->res.fattr->size) hdr->res.eof =1 ; }return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 32/52 netfilter: nf_conntrack_ftp: Fix debug output
In reply to Sasha LevinFrom: Thomas Jarosch <[email protected]>
[ Upstream commit 3a069024d371125227de3ac8fa74223fcf473520 ]
The find_pattern() debug output was printing the 'skip' character. This can be a NULL-byte and messes up further pr_debug() output.
Output without the fix:
kernel: nf_conntrack_ftp: Pattern matches!
kernel: nf_conntrack_ftp: Skipped up to <7>nf_conntrack_ftp: find_pattern PORT': dlen = 8
kernel: nf_conntrack_ftp: find_pattern `EPRT': dlen = 8
Output with the fix:
kernel: nf_conntrack_ftp: Pattern matches!
kernel: nf_conntrack_ftp: Skipped up to 0x0 delimiter!
kernel: nf_conntrack_ftp: Match succeeded!
kernel: nf_conntrack_ftp: conntrack_ftp: match `172,17,0,100,200,207' (20 bytes at 4150681645)
kernel: nf_conntrack_ftp: find_pattern `PORT': dlen = 8
--- net/netfilter/nf_conntrack_ftp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_ftp.c +1 -1
@@ -323,7 +323,7 @@ static int find_pattern(const char *data, size_t dlen, i++; } -pr_debug ("Skipped up to `%c'!\n" , skip); +pr_debug ("Skipped up to 0x%hhx delimiter!\n" , skip); *numoff = i; *numlen =getnum (data + i, dlen - i, cmd, term, numoff);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 24/52 qed: Add cleanup in qed_slowpath_start()
In reply to Sasha LevinFrom: Wenwen Wang <[email protected]>
[ Upstream commit de0e4fd2f07ce3bbdb69dfb8d9426b7227451b69 ]
If qed_mcp_send_drv_version() fails, no cleanup is executed, leading to memory leaks. To fix this issue, introduce the label 'err4' to perform the cleanup work before returning the error.
--- drivers/net/ethernet/qlogic/qed/qed_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qed/qed_main.c +3 -1
@@ -1150,7 +1150,7 @@ static int qed_slowpath_start(struct qed_dev *cdev, &drv_version);if (rc) {DP_NOTICE (cdev,"Failed sending drv version command\n" ); -return rc; + goto err4; } }
@@ -1158,6 +1158,8 @@ static int qed_slowpath_start(struct qed_dev *cdev,return 0 ; +err4: +qed_ll2_dealloc_if (cdev); err3:qed_hw_stop (cdev); err2:
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 26/52 batman-adv: Only read OGM tvlv_len after buffer len check
In reply to Sasha LevinFrom: Sven Eckelmann <[email protected]>
[ Upstream commit a15d56a60760aa9dbe26343b9a0ac5228f35d445 ]
Multiple batadv_ogm_packet can be stored in an skbuff. The functions batadv_iv_ogm_send_to_if()/batadv_iv_ogm_receive() use batadv_iv_ogm_aggr_packet() to check if there is another additional batadv_ogm_packet in the skb or not before they continue processing the packet.
The length for such an OGM is BATADV_OGM_HLEN + batadv_ogm_packet->tvlv_len. The check must first check that at least BATADV_OGM_HLEN bytes are available before it accesses tvlv_len (which is part of the header. Otherwise it might try read outside of the currently available skbuff to get the content of tvlv_len.
--- net/batman-adv/bat_iv_ogm.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
net/batman-adv/bat_iv_ogm.c +13 -7
@@ -463,17 +463,23 @@ static u8 batadv_hop_penalty(u8 tq, const struct batadv_priv *bat_priv)* batadv_iv_ogm_aggr_packet() - checks if there is another OGM attached * @buff_pos: current position in the skb * @packet_len: total length of the skb -* @tvlv_len: tvlv length of the previously considered OGM +* @ogm_packet: potential OGM in buffer * * Return: true if there is enough space for another OGM, false otherwise. */ -static bool batadv_iv_ogm_aggr_packet (int buff_pos,int packet_len, -__be16 tvlv_len) +static bool +batadv_iv_ogm_aggr_packet (int buff_pos,int packet_len, +const struct batadv_ogm_packet *ogm_packet) {int next_buff_pos =0 ; - next_buff_pos += buff_pos +BATADV_OGM_HLEN ; - next_buff_pos +=ntohs (tvlv_len); +/* check if there is enough space for the header */ + next_buff_pos += buff_pos +sizeof (*ogm_packet); +if (next_buff_pos > packet_len) +return false; + +/* check if there is enough space for the optional TVLV */ + next_buff_pos +=ntohs (ogm_packet->tvlv_len);return (next_buff_pos <= packet_len) && (next_buff_pos <=BATADV_MAX_AGGREGATION_BYTES );
@@ -501,7 +507,7 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,/* adjust all flags and log packets */ while (batadv_iv_ogm_aggr_packet (buff_pos, forw_packet->packet_len, - batadv_ogm_packet->tvlv_len)) { + batadv_ogm_packet)) {/* we might have aggregated direct link packets with an * ordinary base packet */
@@ -1852,7 +1858,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb,/* unpack the aggregated packets and process them one by one */ while (batadv_iv_ogm_aggr_packet (ogm_offset,skb_headlen (skb), - ogm_packet->tvlv_len)) { + ogm_packet)) {batadv_iv_ogm_process (skb, ogm_offset, if_incoming); ogm_offset +=BATADV_OGM_HLEN ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 22/52 Kconfig: Fix the reference to the IDT77105 Phy driver in the description of ATM_NICSTAR_USE_IDT77105
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit cd9d4ff9b78fcd0fc4708900ba3e52e71e1a7690 ]
This should be IDT77105, not IDT77015.
--- drivers/atm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/atm/Kconfig +1 -1
@@ -200,7 +200,7 @@ config ATM_NICSTAR_USE_SUNI make the card work). config ATM_NICSTAR_USE_IDT77105 - bool "Use IDT77015 PHY driver (25Mbps)" + bool "Use IDT77105 PHY driver (25Mbps)" depends on ATM_NICSTAR help Support for the PHYsical layer chip in ForeRunner LE25 cards. In
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 17/52 netfilter: nft_flow_offload: missing netlink attribute policy
In reply to Sasha LevinFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 14c415862c0630e01712a4eeaf6159a2b1b6d2a4 ]
The netlink attribute policy for NFTA_FLOW_TABLE_NAME is missing.
--- net/netfilter/nft_flow_offload.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/nft_flow_offload.c +6 -0
@@ -146,6 +146,11 @@ static int nft_flow_offload_validate(const struct nft_ctx *ctx,return nft_chain_validate_hooks (ctx->chain, hook_mask); } +static const struct nla_policy nft_flow_offload_policy[NFTA_FLOW_MAX +1 ] = { + [NFTA_FLOW_TABLE_NAME ] = { .type =NLA_STRING , + .len =NFT_NAME_MAXLEN -1 }, +}; +static int nft_flow_offload_init (const struct nft_ctx *ctx,const struct nft_expr *expr,const struct nlattr *const tb[])
@@ -204,6 +209,7 @@ static const struct nft_expr_ops nft_flow_offload_ops = {static struct nft_expr_type nft_flow_offload_type__read_mostly = { .name ="flow_offload" , .ops = &nft_flow_offload_ops, + .policy = nft_flow_offload_policy, .maxattr =NFTA_FLOW_MAX , .owner =THIS_MODULE , };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/52 tools: bpftool: close prog FD before exit on showing a single program
In reply to Sasha LevinFrom: Quentin Monnet <[email protected]>
[ Upstream commit d34b044038bfb0e19caa8b019910efc465f41d5f ]
When showing metadata about a single program by invoking "bpftool prog show PROG", the file descriptor referring to the program is not closed before returning from the function. Let's close it.
--- tools/bpf/bpftool/prog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/bpf/bpftool/prog.c +3 -1
@@ -381,7 +381,9 @@ static int do_show(int argc, char **argv)if (fd <0 )return -1 ; -return show_prog (fd); + err =show_prog (fd); +close (fd); +return err; }if (argc)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/52 netfilter: ebtables: Fix argument order to ADD_COUNTER
In reply to Sasha LevinFrom: Todd Seidelmann <[email protected]>
[ Upstream commit f20faa06d83de440bec8e200870784c3458793c4 ]
The ordering of arguments to the x_tables ADD_COUNTER macro appears to be wrong in ebtables (cf. ip_tables.c, ip6_tables.c, and arp_tables.c).
This causes data corruption in the ebtables userspace tools because they get incorrect packet & byte counts from the kernel.
--- net/bridge/netfilter/ebtables.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/bridge/netfilter/ebtables.c +4 -4
@@ -225,7 +225,7 @@ unsigned int ebt_do_table(struct sk_buff *skb,return NF_DROP ; } -ADD_COUNTER (*(counter_base + i),1 , skb->len); +ADD_COUNTER (*(counter_base + i), skb->len,1 );/* these should only watch: not modify, nor tell us * what to do with the packet
@@ -963,8 +963,8 @@ static void get_counters(const struct ebt_counter *oldcounters,continue ; counter_base =COUNTER_BASE (oldcounters, nentries, cpu);for (i =0 ; i < nentries; i++) -ADD_COUNTER (counters[i], counter_base[i].pcnt, - counter_base[i].bcnt); +ADD_COUNTER (counters[i], counter_base[i].bcnt, + counter_base[i].pcnt); } }
@@ -1289,7 +1289,7 @@ static int do_update_counters(struct net *net, const char *name,/* we add to the counters of the first cpu */ for (i =0 ; i < num_counters; i++) -ADD_COUNTER (t->private->counters[i], tmp[i].pcnt, tmp[i].bcnt); +ADD_COUNTER (t->private->counters[i], tmp[i].bcnt, tmp[i].pcnt);write_unlock_bh (&t->lock); ret =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/52 selftests/bpf: fix "bind{4, 6} deny specific IP & port" on s390
In reply to Sasha LevinFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit 27df5c7068bf23cab282dc64b1c9894429b3b8a0 ]
"bind4 allow specific IP & port" and "bind6 deny specific IP & port" fail on s390 because of endianness issue: the 4 IP address bytes are loaded as a word and compared with a constant, but the value of this constant should be different on big- and little- endian machines, which is not the case right now.
Use __bpf_constant_ntohl to generate proper value based on machine endianness.
--- tools/testing/selftests/bpf/test_sock.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/test_sock.c +5 -2
@@ -13,6 +13,7 @@#include <bpf/bpf.h> #include "cgroup_helpers.h" +#include "bpf_endian.h" #include "bpf_rlimit.h" #include "bpf_util.h"
@@ -231,7 +232,8 @@ static struct sock_test tests[] = {/* if (ip == expected && port == expected) */ BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock, src_ip6[3])), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x01000000 ,4 ), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__bpf_constant_ntohl (0x00000001 ),4 ),BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock , src_port)), BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x2001, 2),
@@ -260,7 +262,8 @@ static struct sock_test tests[] = {/* if (ip == expected && port == expected) */ BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock , src_ip4)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x0100007F ,4 ), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__bpf_constant_ntohl (0x7F000001 ),4 ),BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock , src_port)), BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x1002, 2),
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/52 bus: ti-sysc: Simplify cleanup upon failures in sysc_probe()
In reply to Sasha LevinFrom: Suman Anna <[email protected]>
[ Upstream commit a304f483b6b00d42bde41c45ca52c670945348e2 ]
The clocks are not yet parsed and prepared until after a successful sysc_get_clocks(), so there is no need to unprepare the clocks upon any failure of any of the prior functions in sysc_probe(). The current code path would have been a no-op because of the clock validity checks within sysc_unprepare(), but let's just simplify the cleanup path by returning the error directly.
While at this, also fix the cleanup path for a sysc_init_resets() failure which is executed after the clocks are prepared.
--- drivers/bus/ti-sysc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/bus/ti-sysc.c +7 -7
@@ -1685,7 +1685,7 @@ static int sysc_probe(struct platform_device *pdev) error =sysc_init_dts_quirks (ddata);if (error) - goto unprepare; +return error; error =sysc_get_clocks (ddata);if (error)
@@ -1693,27 +1693,27 @@ static int sysc_probe(struct platform_device *pdev) error =sysc_map_and_check_registers (ddata);if (error) - goto unprepare; +return error; error =sysc_init_sysc_mask (ddata);if (error) - goto unprepare; +return error; error =sysc_init_idlemodes (ddata);if (error) - goto unprepare; +return error; error =sysc_init_syss_mask (ddata);if (error) - goto unprepare; +return error; error =sysc_init_pdata (ddata);if (error) - goto unprepare; +return error; error =sysc_init_resets (ddata);if (error) -return error; + goto unprepare;pm_runtime_enable (ddata->dev); error =sysc_init_module (ddata);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/52 bus: ti-sysc: Fix using configured sysc mask value
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit e212abd452a4af3174fcd469d46656f83e135a19 ]
We have cases where there are no softreset bits like with am335x lcdc. In that case ti,sysc-mask = <0> needs to be handled properly.
--- drivers/bus/ti-sysc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/bus/ti-sysc.c +1 -4
@@ -1022,10 +1022,7 @@ static int sysc_init_sysc_mask(struct sysc *ddata)if (error)return 0 ; -if (val) - ddata->cfg.sysc_val = val & ddata->cap->sysc_mask; -else - ddata->cfg.sysc_val = ddata->cap->sysc_mask; + ddata->cfg.sysc_val = val & ddata->cap->sysc_mask;return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 21/52 NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit 17d8c5d145000070c581f2a8aa01edc7998582ab ]
Initialise the result count to 0 rather than initialising it to the argument count. The reason is that we want to ensure we record the I/O stats correctly in the case where an error is returned (for instance in the layoutstats).
--- fs/nfs/pagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/pagelist.c +1 -1
@@ -567,7 +567,7 @@ static void nfs_pgio_rpcsetup(struct nfs_pgio_header *hdr, } hdr->res.fattr = &hdr->fattr; - hdr->res.count = count; + hdr->res.count =0 ; hdr->res.eof =0 ; hdr->res.verf = &hdr->verf;nfs_fattr_init (&hdr->fattr);
Signature · 1 line
2.20.1