Linux 3.18.96
Greg KH
maintainerI'm announcing the release of the 3.18.96 kernel.
All users of the 3.18 kernel series must upgrade.
The updated 3.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.18.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/dma/snps-dma.txt | 2 Documentation/filesystems/ext4.txt | 2 Makefile | 2 arch/arm/boot/dts/am4372.dtsi | 6 - arch/arm/boot/dts/s5pv210.dtsi | 1 arch/arm/boot/dts/spear1310-evb.dts | 2 arch/arm/boot/dts/spear1340.dtsi | 4 arch/arm/boot/dts/spear13xx.dtsi | 6 - arch/arm/boot/dts/spear600.dtsi | 1 arch/arm/mach-omap2/prm33xx.c | 12 -- arch/powerpc/perf/core-book3s.c | 4 arch/s390/kernel/compat_linux.c | 8 - arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 112 +++++++++++---------- arch/x86/kvm/x86.c | 34 ++++-- arch/x86/mm/ioremap.c | 4 arch/x86/mm/kmmio.c | 12 +- drivers/Makefile | 1 drivers/crypto/s5p-sss.c | 13 +- drivers/devfreq/devfreq.c | 2 drivers/dma/dma-jz4740.c | 4 drivers/gpu/drm/radeon/radeon_uvd.c | 2 drivers/infiniband/hw/mlx4/main.c | 13 -- drivers/media/i2c/s5k6aa.c | 5 drivers/media/tuners/r820t.c | 13 +- drivers/net/ethernet/freescale/gianfar.c | 6 - drivers/net/ethernet/mellanox/mlx4/qp.c | 3 drivers/net/hippi/rrunner.c | 2 drivers/s390/block/dasd_eckd.c | 16 +-- drivers/spi/spi-sun4i.c | 2 drivers/usb/usbip/stub_dev.c | 3 drivers/usb/usbip/vhci_hcd.c | 2 drivers/video/console/dummycon.c | 1 drivers/video/fbdev/atmel_lcdfb.c | 8 + drivers/video/fbdev/mmp/core.c | 5 drivers/xen/Kconfig | 2 fs/btrfs/inode.c | 5 fs/btrfs/ioctl.c | 2 fs/btrfs/tree-log.c | 9 + fs/ext4/super.c | 1 include/linux/string.h | 1 include/net/red.h | 13 ++ lib/oid_registry.c | 8 + mm/early_ioremap.c | 2 mm/util.c | 24 ++++ mm/vmscan.c | 3 net/core/dev.c | 2 net/decnet/af_decnet.c | 62 ++++++----- net/ipv4/ip_sockglue.c | 14 -- net/ipv4/netfilter/ipt_CLUSTERIP.c | 16 ++- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 - net/ipv6/ipv6_sockglue.c | 17 --- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 18 ++- net/netfilter/x_tables.c | 10 + net/netfilter/xt_RATEEST.c | 22 +++- net/sched/sch_choke.c | 3 net/sched/sch_gred.c | 3 net/sched/sch_red.c | 2 net/sched/sch_sfq.c | 3 net/xfrm/xfrm_user.c | 24 ++++ scripts/kernel-doc | 2 security/selinux/ss/services.c | 21 ++- sound/core/seq/seq_clientmgr.c | 23 ++-- sound/soc/ux500/mop500.c | 4 sound/soc/ux500/ux500_pcm.c | 5 tools/perf/bench/numa.c | 56 +++++++++- tools/perf/builtin-top.c | 15 ++ 66 files changed, 477 insertions(+), 234 deletions(-)
Arnd Bergmann (4):
ARM: dts: s5pv210: add interrupt-parent for ohci
media: r820t: fix r820t_write_reg for KASAN
ASoC: ux500: add MODULE_LICENSE tag
video: fbdev/mmp: add MODULE_LICENSE
Bjorn Andersson (1):
PM / devfreq: Propagate error from devfreq_add_device()
Cong Wang (2):
xfrm: check id proto in validate_tmpl()
netfilter: xt_RATEEST: acquire xt_rateest_mutex for hash insert
Dave Young (1):
mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep
David Howells (1):
Provide a function to create a NUL-terminated string from unterminated data
Dmitry Vyukov (2):
netfilter: x_tables: fix int overflow in xt_alloc_table_info()
netfilter: ipt_CLUSTERIP: fix out-of-bounds accesses in clusterip_tg_check()
Eric Biggers (2):
crypto: x86/twofish-3way - Fix %rbp usage
509: fix printing uninitialized stack memory when OID is empty
Eric Dumazet (1):
netfilter: x_tables: avoid out-of-bounds reads in xt_request_find_{match|target}Ernesto A. Fernández (1):
ext4: correct documentation for grpid mount option
Eugene Syromiatnikov (1):
s390: fix handling of -1 in set{,fs}[gu]id16 syscalls
Greg Kroah-Hartman (1):
Linux 3.18.96
Jack Morgenstein (1):
IB/mlx4: Fix incorrectly releasing steerable UD QPs when have only ETH ports
Jan Beulich (1):
xen: XEN_ACPI_PROCESSOR is Dom0-only
Jia-Ju Bai (1):
hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close
Jiri Olsa (1):
perf top: Fix window dimensions change handling
Johan Hovold (1):
video: fbdev: atmel_lcdfb: fix display-timings lookup
Julia Lawall (1):
drm/radeon: adjust tested variable
Kamil Konieczny (1):
crypto: s5p-sss - Fix kernel Oops in AES-ECB mode
Karol Herbst (1):
x86/mm/kmmio: Fix mmiotrace for page unaligned addresses
Keerthy (1):
ARM: AM33xx: PRM: Remove am33xx_pwrdm_read_prev_pwrst function
Liu Bo (2):
Btrfs: fix deadlock in run_delalloc_nocow
Btrfs: fix crash due to not cleaning up tree log block's dirty bits
Mauro Carvalho Chehab (1):
media: s5k6aa: describe some function parameters
Nicolas Pitre (1):
console/dummy: leave .con_font_get set to NULL
Nikolay Borisov (1):
btrfs: Fix possible off-by-one in btrfs_search_path_in_tree
Nogah Frankel (2):
net_sched: red: Avoid devision by zero
net_sched: red: Avoid illegal values
Paolo Abeni (2):
netfilter: on sockopt() acquire sock lock only in the required scope
dn_getsockoptdecnet: move nf_{get/set}sockopt outside sock lock
Paul Moore (2):
selinux: skip bounded transition processing if the policy isn't loaded
selinux: ensure the context is NUL terminated in security_context_to_sid_core()
Peter Ujfalusi (1):
ARM: dts: am4372: Correct the interrupts_properties of McASP
Randy Dunlap (1):
usb: build drivers/usb/common/ when USB_SUPPORT is set
Ravi Bangoria (1):
powerpc/perf: Fix oops when grouping different pmu events
Satheesh Rajendran (1):
perf bench numa: Fixup discontiguous/sparse numa nodes
Shuah Khan (1):
usbip: keep usbip_device sockfd state in sync with tcp_socket
Stefan Haberland (1):
s390/dasd: prevent prefix I/O error
Steffen Klassert (1):
xfrm: Fix stack-out-of-bounds with misconfigured transport mode policies.
Takashi Iwai (2):
ALSA: seq: Fix regression by incorrect ioctl_mutex usages
ALSA: seq: Fix racy pool initializations
Takuo Koguchi (1):
spi: sun4i: disable clocks in the remove function
Tetsuo Handa (1):
mm,vmscan: Make unregister_shrinker() no-op if register_shrinker() failed.
Tobias Jordan (1):
dmaengine: jz4740: disable/unprepare clk if probe fails
Viresh Kumar (3):
arm: spear600: Add missing interrupt-parent of rtc
arm: spear13xx: Fix dmas cells
arm: spear13xx: Fix spics gpio controller's warning
Wanpeng Li (1):
KVM: async_pf: Fix #DF due to inject "Page not Present" and "Page Ready" exceptions simultaneously
Will Deacon (1):
scripts/kernel-doc: Don't fail with status != 0 if error encountered with -none
Willem de Bruijn (1):
net: avoid skb_warn_bad_offload on IS_ERR
Zhouyi Zhou (1):
ext4: save error to disk in __ext4_grp_locked_error()
Zumeng Chen (1):
gianfar: fix a flooded alignment reports because of padding issue.
Greg KH
maintainerDocumentation/devicetree/bindings/dma/snps-dma.txt +1 -1
@@ -58,6 +58,6 @@ Example: interrupts = <0 35 0x4>; status = "disabled"; dmas = <&dmahost 12 0 1>, - <&dmahost 13 0 1 0>; + <&dmahost 13 1 0>; dma-names = "rx", "rx"; };
Documentation/filesystems/ext4.txt +1 -1
@@ -233,7 +233,7 @@ data_err=ignore(*) Just print an error message if an error occurs data_err=abort Abort the journal if an error occurs in a file data buffer in ordered mode. -grpid Give objects the same group ID as their creator. +grpid New objects have the group ID of their parent. bsdgroups nogrpid (*) New objects have the group ID of their creator.
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 18 -SUBLEVEL = 95 +SUBLEVEL = 96 EXTRAVERSION = NAME = Diseased Newt
arch/arm/boot/dts/am4372.dtsi +4 -2
@@ -702,7 +702,8 @@ reg = <0x48038000 0x2000>, <0x46000000 0x400000>; reg-names = "mpu", "dat"; - interrupts = <80>, <81>; + interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "tx", "rx"; status = "disabled"; dmas = <&edma 8>,
@@ -716,7 +717,8 @@ reg = <0x4803C000 0x2000>, <0x46400000 0x400000>; reg-names = "mpu", "dat"; - interrupts = <82>, <83>; + interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "tx", "rx"; status = "disabled"; dmas = <&edma 10>,
arch/arm/boot/dts/s5pv210.dtsi +1 -0
@@ -461,6 +461,7 @@ compatible = "samsung,exynos4210-ohci"; reg = <0xec300000 0x100>; interrupts = <23>; + interrupt-parent = <&vic1>; clocks = <&clocks CLK_USB_HOST>; clock-names = "usbhost"; #address-cells = <1>;
arch/arm/boot/dts/spear1310-evb.dts +1 -1
@@ -349,7 +349,7 @@ spi0: spi@e0100000 { status = "okay"; num-cs = <3>; - cs-gpios = <&gpio1 7 0>, <&spics 0>, <&spics 1>; + cs-gpios = <&gpio1 7 0>, <&spics 0 0>, <&spics 1 0>; stmpe610@0 { compatible = "st,stmpe610";
arch/arm/boot/dts/spear1340.dtsi +2 -2
@@ -141,8 +141,8 @@ reg = <0xb4100000 0x1000>; interrupts = <0 105 0x4>; status = "disabled"; - dmas = <&dwdma0 0x600 0 0 1>, /* 0xC << 11 */ - <&dwdma0 0x680 0 1 0>; /* 0xD << 7 */ + dmas = <&dwdma0 12 0 1>, + <&dwdma0 13 1 0>; dma-names = "tx", "rx"; };
arch/arm/boot/dts/spear13xx.dtsi +3 -3
@@ -100,7 +100,7 @@ reg = <0xb2800000 0x1000>; interrupts = <0 29 0x4>; status = "disabled"; - dmas = <&dwdma0 0 0 0 0>; + dmas = <&dwdma0 0 0 0>; dma-names = "data"; };
@@ -288,8 +288,8 @@ #size-cells = <0>; interrupts = <0 31 0x4>; status = "disabled"; - dmas = <&dwdma0 0x2000 0 0 0>, /* 0x4 << 11 */ - <&dwdma0 0x0280 0 0 0>; /* 0x5 << 7 */ + dmas = <&dwdma0 4 0 0>, + <&dwdma0 5 0 0>; dma-names = "tx", "rx"; };
arch/arm/boot/dts/spear600.dtsi +1 -0
@@ -194,6 +194,7 @@ rtc@fc900000 { compatible = "st,spear600-rtc"; reg = <0xfc900000 0x1000>; + interrupt-parent = <&vic0>; interrupts = <10>; status = "disabled"; };
arch/arm/mach-omap2/prm33xx.c +0 -12
@@ -165,17 +165,6 @@ static int am33xx_pwrdm_read_pwrst(struct powerdomain *pwrdm)return v; } -static int am33xx_pwrdm_read_prev_pwrst (struct powerdomain *pwrdm) -{ -u32 v; - - v =am33xx_prm_read_reg (pwrdm->prcm_offs, pwrdm->pwrstst_offs); - v &=AM33XX_LASTPOWERSTATEENTERED_MASK ; - v >>=AM33XX_LASTPOWERSTATEENTERED_SHIFT ; - -return v; -} -static int am33xx_pwrdm_set_lowpwrstchange (struct powerdomain *pwrdm) { am33xx_prm_rmw_reg_bits(AM33XX_LOWPOWERSTATECHANGE_MASK,
@@ -329,7 +318,6 @@ struct pwrdm_ops am33xx_pwrdm_operations = { .pwrdm_set_next_pwrst = am33xx_pwrdm_set_next_pwrst, .pwrdm_read_next_pwrst = am33xx_pwrdm_read_next_pwrst, .pwrdm_read_pwrst = am33xx_pwrdm_read_pwrst, - .pwrdm_read_prev_pwrst = am33xx_pwrdm_read_prev_pwrst, .pwrdm_set_logic_retst = am33xx_pwrdm_set_logic_retst, .pwrdm_read_logic_pwrst = am33xx_pwrdm_read_logic_pwrst, .pwrdm_read_logic_retst = am33xx_pwrdm_read_logic_retst,
arch/powerpc/perf/core-book3s.c +2 -2
@@ -1376,7 +1376,7 @@ static int collect_events(struct perf_event *group, int max_count,int n =0 ;struct perf_event *event; -if (!is_software_event (group)) { +if (group->pmu->task_ctx_nr == perf_hw_context) {if (n >= max_count)return -1 ; ctrs[n] = group;
@@ -1384,7 +1384,7 @@ static int collect_events(struct perf_event *group, int max_count, events[n++] = group->hw.config; }list_for_each_entry (event, &group->sibling_list, group_entry) { -if (!is_software_event (event) && +if (event->pmu->task_ctx_nr == perf_hw_context && event->state !=PERF_EVENT_STATE_OFF ) {if (n >= max_count)return -1 ;
arch/s390/kernel/compat_linux.c +4 -4
@@ -110,7 +110,7 @@ COMPAT_SYSCALL_DEFINE2(s390_setregid16, u16, rgid, u16, egid) COMPAT_SYSCALL_DEFINE1(s390_setgid16, u16, gid) { -return sys_setgid ((gid_t )gid); +return sys_setgid (low2highgid (gid)); }COMPAT_SYSCALL_DEFINE2 (s390_setreuid16, u16, ruid, u16, euid)
@@ -120,7 +120,7 @@ COMPAT_SYSCALL_DEFINE2(s390_setreuid16, u16, ruid, u16, euid) COMPAT_SYSCALL_DEFINE1(s390_setuid16, u16, uid) { -return sys_setuid ((uid_t )uid); +return sys_setuid (low2highuid (uid)); }COMPAT_SYSCALL_DEFINE3 (s390_setresuid16, u16, ruid, u16, euid, u16, suid)
@@ -173,12 +173,12 @@ COMPAT_SYSCALL_DEFINE3(s390_getresgid16, u16 __user *, rgidp, COMPAT_SYSCALL_DEFINE1(s390_setfsuid16, u16, uid) { -return sys_setfsuid ((uid_t )uid); +return sys_setfsuid (low2highuid (uid)); } COMPAT_SYSCALL_DEFINE1(s390_setfsgid16, u16, gid) { -return sys_setfsgid ((gid_t )gid); +return sys_setfsgid (low2highgid (gid)); }static int groups16_to_user (u16 __user *grouplist,struct group_info *group_info)
arch/x86/crypto/twofish-x86_64-asm_64-3way.S +60 -52
208 lines not on this page · raw message
arch/x86/kvm/x86.c +26 -8
@@ -7756,6 +7756,13 @@ static int apf_put_user(struct kvm_vcpu *vcpu, u32 val) sizeof(val)); } +static int apf_get_user (struct kvm_vcpu *vcpu,u32 *val) +{ + +return kvm_read_guest_cached (vcpu->kvm, &vcpu->arch.apf.data, val, +sizeof (u32)); +} +void kvm_arch_async_page_not_present (struct kvm_vcpu *vcpu,struct kvm_async_pf *work) {
@@ -7782,6 +7789,7 @@ void kvm_arch_async_page_present(struct kvm_vcpu *vcpu, struct kvm_async_pf *work) {struct x86_exception fault; +u32 val;if (work->wakeup_all) work->arch.token = ~0 ;/* broadcast wakeup */
@@ -7789,14 +7797,24 @@ void kvm_arch_async_page_present(struct kvm_vcpu *vcpu,kvm_del_async_pf_gfn (vcpu, work->arch.gfn);trace_kvm_async_pf_ready (work->arch.token, work->gva); -if ((vcpu->arch.apf.msr_val &KVM_ASYNC_PF_ENABLED ) && - !apf_put_user (vcpu,KVM_PV_REASON_PAGE_READY )) { - fault.vector =PF_VECTOR ; - fault.error_code_valid = true; - fault.error_code =0 ; - fault.nested_page_fault = false; - fault.address = work->arch.token; -kvm_inject_page_fault (vcpu, &fault); +if (vcpu->arch.apf.msr_val &KVM_ASYNC_PF_ENABLED && + !apf_get_user (vcpu, &val)) { +if (val ==KVM_PV_REASON_PAGE_NOT_PRESENT && + vcpu->arch.exception.pending && + vcpu->arch.exception.nr ==PF_VECTOR && + !apf_put_user (vcpu,0 )) { + vcpu->arch.exception.pending = false; + vcpu->arch.exception.nr =0 ; + vcpu->arch.exception.has_error_code = false; + vcpu->arch.exception.error_code =0 ; + }else if (!apf_put_user (vcpu,KVM_PV_REASON_PAGE_READY )) { + fault.vector =PF_VECTOR ; + fault.error_code_valid = true; + fault.error_code =0 ; + fault.nested_page_fault = false; + fault.address = work->arch.token; +kvm_inject_page_fault (vcpu, &fault); + } } vcpu->arch.apf.halted = false; vcpu->arch.mp_state =KVM_MP_STATE_RUNNABLE ;
arch/x86/mm/ioremap.c +2 -2
@@ -296,11 +296,11 @@ void iounmap(volatile void __iomem *addr) (void __force *)addr < phys_to_virt(ISA_END_ADDRESS))return ; +mmiotrace_iounmap (addr); + addr = (volatile void __iomem *) (PAGE_MASK & (unsigned long __force )addr); -mmiotrace_iounmap (addr); -/* Use the vm area unlocked, assuming the caller ensures there isn't another iounmap for the same address in parallel. Reuse of the virtual address is prevented by
arch/x86/mm/kmmio.c +7 -5
@@ -434,17 +434,18 @@ int register_kmmio_probe(struct kmmio_probe *p)unsigned long flags;int ret =0 ;unsigned long size =0 ; +unsigned long addr = p->addr &PAGE_MASK ;const unsigned long size_lim = p->len + (p->addr & ~PAGE_MASK );unsigned int l;pte_t *pte;spin_lock_irqsave (&kmmio_lock, flags); -if (get_kmmio_probe (p->addr)) { +if (get_kmmio_probe (addr)) { ret = -EEXIST ; goto out; } - pte =lookup_address (p->addr, &l); + pte =lookup_address (addr, &l);if (!pte) { ret = -EINVAL ; goto out;
@@ -453,7 +454,7 @@ int register_kmmio_probe(struct kmmio_probe *p) kmmio_count++;list_add_rcu (&p->list, &kmmio_probes);while (size < size_lim) { -if (add_kmmio_fault_page (p->addr + size)) +if (add_kmmio_fault_page (addr + size))pr_err ("Unable to set page fault.\n" ); size +=page_level_size (l); }
@@ -527,19 +528,20 @@ void unregister_kmmio_probe(struct kmmio_probe *p) {unsigned long flags;unsigned long size =0 ; +unsigned long addr = p->addr &PAGE_MASK ;const unsigned long size_lim = p->len + (p->addr & ~PAGE_MASK );struct kmmio_fault_page *release_list =NULL ;struct kmmio_delayed_release *drelease;unsigned int l;pte_t *pte; - pte =lookup_address (p->addr, &l); + pte =lookup_address (addr, &l);if (!pte)return ;spin_lock_irqsave (&kmmio_lock, flags);while (size < size_lim) { -release_kmmio_fault_page (p->addr + size, &release_list); +release_kmmio_fault_page (addr + size, &release_list); size +=page_level_size (l); }list_del_rcu (&p->list);
drivers/Makefile +1 -0
@@ -90,6 +90,7 @@ obj-$(CONFIG_TC) += tc/ obj-$(CONFIG_UWB) += uwb/ obj-$(CONFIG_USB_PHY) += usb/ obj-$(CONFIG_USB) += usb/ +obj-$(CONFIG_USB_SUPPORT) += usb/ obj-$(CONFIG_PCI) += usb/ obj-$(CONFIG_USB_GADGET) += usb/ obj-$(CONFIG_SERIO) += input/serio/
drivers/crypto/s5p-sss.c +9 -4
@@ -419,16 +419,21 @@ static void s5p_aes_crypt_start(struct s5p_aes_dev *dev, unsigned long mode)uint32_t aes_control;int err;unsigned long flags; +u8 *iv; aes_control =SSS_AES_KEY_CHANGE_MODE ;if (mode &FLAGS_AES_DECRYPT ) aes_control |=SSS_AES_MODE_DECRYPT ; -if ((mode &FLAGS_AES_MODE_MASK ) ==FLAGS_AES_CBC ) +if ((mode &FLAGS_AES_MODE_MASK ) ==FLAGS_AES_CBC ) { aes_control |=SSS_AES_CHAIN_MODE_CBC ; -else if ((mode &FLAGS_AES_MODE_MASK ) ==FLAGS_AES_CTR ) + iv = req->info; + }else if ((mode &FLAGS_AES_MODE_MASK ) ==FLAGS_AES_CTR ) { aes_control |=SSS_AES_CHAIN_MODE_CTR ; - + iv = req->info; + }else { + iv =NULL ;/* AES_ECB */ + }if (dev->ctx->keylen ==AES_KEYSIZE_192 ) aes_control |=SSS_AES_KEY_SIZE_192 ;else if (dev->ctx->keylen ==AES_KEYSIZE_256 )
@@ -458,7 +463,7 @@ static void s5p_aes_crypt_start(struct s5p_aes_dev *dev, unsigned long mode) goto outdata_error;SSS_AES_WRITE (dev,AES_CONTROL , aes_control); -s5p_set_aes (dev, dev->ctx->aes_key, req->info, dev->ctx->keylen); +s5p_set_aes (dev, dev->ctx->aes_key, iv, dev->ctx->keylen);s5p_set_dma_indata (dev, req->src);s5p_set_dma_outdata (dev, req->dst);
drivers/devfreq/devfreq.c +1 -1
@@ -585,7 +585,7 @@ struct devfreq *devm_devfreq_add_device(struct device *dev, devfreq =devfreq_add_device (dev, profile, governor_name, data);if (IS_ERR (devfreq)) {devres_free (ptr); -return ERR_PTR (-ENOMEM ); +return devfreq; } *ptr = devfreq;
drivers/dma/dma-jz4740.c +3 -1
@@ -575,7 +575,7 @@ static int jz4740_dma_probe(struct platform_device *pdev) ret =dma_async_device_register (dd);if (ret) -return ret; + goto err_clk; irq =platform_get_irq (pdev,0 ); ret =request_irq (irq, jz4740_dma_irq,0 ,dev_name (&pdev->dev), dmadev);
@@ -588,6 +588,8 @@ static int jz4740_dma_probe(struct platform_device *pdev) err_unregister:dma_async_device_unregister (dd); +err_clk: +clk_disable_unprepare (dmadev->clk);return ret; }
drivers/gpu/drm/radeon/radeon_uvd.c +1 -1
@@ -947,7 +947,7 @@ int radeon_uvd_calc_upll_dividers(struct radeon_device *rdev,/* calc dclk divider with current vco freq */ dclk_div =radeon_uvd_calc_upll_post_div (vco_freq, dclk, pd_min, pd_even); -if (vclk_div > pd_max) +if (dclk_div > pd_max)break ;/* vco is too big, it has to stop */ /* calc score with current vco freq */
drivers/infiniband/hw/mlx4/main.c +5 -8
@@ -2348,9 +2348,8 @@ err_steer_free_bitmap:kfree (ibdev->ib_uc_qpns_bitmap); err_steer_qp_release: -if (ibdev->steering_support ==MLX4_STEERING_MODE_DEVICE_MANAGED ) -mlx4_qp_release_range (dev, ibdev->steer_qpn_base, - ibdev->steer_qpn_count); +mlx4_qp_release_range (dev, ibdev->steer_qpn_base, + ibdev->steer_qpn_count); err_counter:for (; i; --i)if (ibdev->counters[i -1 ] !=-1 )
@@ -2452,11 +2451,9 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) ibdev->iboe.nb.notifier_call =NULL ; } -if (ibdev->steering_support ==MLX4_STEERING_MODE_DEVICE_MANAGED ) { -mlx4_qp_release_range (dev, ibdev->steer_qpn_base, - ibdev->steer_qpn_count); -kfree (ibdev->ib_uc_qpns_bitmap); - } +mlx4_qp_release_range (dev, ibdev->steer_qpn_base, + ibdev->steer_qpn_count); +kfree (ibdev->ib_uc_qpns_bitmap);if (ibdev->iboe.nb_inet.notifier_call) {if (unregister_inetaddr_notifier (&ibdev->iboe.nb_inet))
drivers/media/i2c/s5k6aa.c +5 -0
@@ -421,6 +421,7 @@ static int s5k6aa_set_ahb_address(struct i2c_client *client)/** * s5k6aa_configure_pixel_clock - apply ISP main clock/PLL configuration +* @s5k6aa: pointer to &struct s5k6aa describing the device * * Configure the internal ISP PLL for the required output frequency. * Locking: called with s5k6aa.lock mutex held.
@@ -669,6 +670,7 @@ static int s5k6aa_set_input_params(struct s5k6aa *s5k6aa)/** * s5k6aa_configure_video_bus - configure the video output interface +* @s5k6aa: pointer to &struct s5k6aa describing the device * @bus_type: video bus type: parallel or MIPI-CSI * @nlanes: number of MIPI lanes to be used (MIPI-CSI only) *
@@ -724,6 +726,8 @@ static int s5k6aa_new_config_sync(struct i2c_client *client, int timeout,/** * s5k6aa_set_prev_config - write user preview register set +* @s5k6aa: pointer to &struct s5k6aa describing the device +* @preset: s5kaa preset to be applied * * Configure output resolution and color fromat, pixel clock * frequency range, device frame rate type and frame period range.
@@ -777,6 +781,7 @@ static int s5k6aa_set_prev_config(struct s5k6aa *s5k6aa,/** * s5k6aa_initialize_isp - basic ISP MCU initialization +* @sd: pointer to V4L2 sub-device descriptor * * Configure AHB addresses for registers read/write; configure PLLs for * required output pixel clock. The ISP power supply needs to be already
drivers/media/tuners/r820t.c +8 -5
@@ -410,9 +410,11 @@ static int r820t_write(struct r820t_priv *priv, u8 reg, const u8 *val,return 0 ; } -static int r820t_write_reg (struct r820t_priv *priv,u8 reg,u8 val) +static inline int r820t_write_reg (struct r820t_priv *priv,u8 reg,u8 val) { -return r820t_write (priv, reg, &val,1 ); +u8 tmp = val;/* work around GCC PR81715 with asan-stack=1 */ + +return r820t_write (priv, reg, &tmp,1 ); }static int r820t_read_cache_reg (struct r820t_priv *priv,int reg)
@@ -425,17 +427,18 @@ static int r820t_read_cache_reg(struct r820t_priv *priv, int reg)return -EINVAL ; } -static int r820t_write_reg_mask (struct r820t_priv *priv,u8 reg,u8 val, +static inline int r820t_write_reg_mask (struct r820t_priv *priv,u8 reg,u8 val,u8 bit_mask) { +u8 tmp = val;int rc =r820t_read_cache_reg (priv, reg);if (rc <0 )return rc; - val = (rc & ~bit_mask) | (val & bit_mask); + tmp = (rc & ~bit_mask) | (tmp & bit_mask); -return r820t_write (priv, reg, &val,1 ); +return r820t_write (priv, reg, &tmp,1 ); }static int r820t_read (struct r820t_priv *priv,u8 reg,u8 *val,int len)
drivers/net/ethernet/freescale/gianfar.c +4 -2
@@ -1356,9 +1356,11 @@ static int gfar_probe(struct platform_device *ofdev)gfar_init_addr_hash_table (priv); -/* Insert receive time stamps into padding alignment bytes */ +/* Insert receive time stamps into padding alignment bytes, and +* plus 2 bytes padding to ensure the cpu alignment. +*/ if (priv->device_flags &FSL_GIANFAR_DEV_HAS_TIMER ) - priv->padding =8 ; + priv->padding =8 +DEFAULT_PADDING ;if (dev->features &NETIF_F_IP_CSUM || priv->device_flags &FSL_GIANFAR_DEV_HAS_TIMER )
drivers/net/ethernet/mellanox/mlx4/qp.c +3 -0
@@ -257,6 +257,9 @@ void mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt)u64 in_param =0 ;int err; +if (!cnt) +return ; +if (mlx4_is_mfunc (dev)) {set_param_l (&in_param, base_qpn);set_param_h (&in_param, cnt);
drivers/net/hippi/rrunner.c +1 -1
@@ -1381,8 +1381,8 @@ static int rr_close(struct net_device *dev) rrpriv->info_dma); rrpriv->info =NULL ; -free_irq (pdev->irq, dev);spin_unlock_irqrestore (&rrpriv->lock, flags); +free_irq (pdev->irq, dev);return 0 ; }
drivers/s390/block/dasd_eckd.c +10 -6
@@ -518,10 +518,12 @@ static int prefix_LRE(struct ccw1 *ccw, struct PFX_eckd_data *pfxdata, pfxdata->validity.define_extent =1 ;/* private uid is kept up to date, conf_data may be outdated */ -if (startpriv->uid.type !=UA_BASE_DEVICE ) { +if (startpriv->uid.type ==UA_BASE_PAV_ALIAS ) pfxdata->validity.verify_base =1 ; -if (startpriv->uid.type ==UA_HYPER_PAV_ALIAS ) - pfxdata->validity.hyper_pav =1 ; + +if (startpriv->uid.type ==UA_HYPER_PAV_ALIAS ) { + pfxdata->validity.verify_base =1 ; + pfxdata->validity.hyper_pav =1 ; }/* define extend data (mostly)*/
@@ -2969,10 +2971,12 @@ static int prepare_itcw(struct itcw *itcw, pfxdata.validity.define_extent =1 ;/* private uid is kept up to date, conf_data may be outdated */ -if (startpriv->uid.type !=UA_BASE_DEVICE ) { +if (startpriv->uid.type ==UA_BASE_PAV_ALIAS ) + pfxdata.validity.verify_base =1 ; + +if (startpriv->uid.type ==UA_HYPER_PAV_ALIAS ) { pfxdata.validity.verify_base =1 ; -if (startpriv->uid.type ==UA_HYPER_PAV_ALIAS ) - pfxdata.validity.hyper_pav =1 ; + pfxdata.validity.hyper_pav =1 ; }switch (cmd) {
drivers/spi/spi-sun4i.c +1 -1
@@ -458,7 +458,7 @@ err_free_master:static int sun4i_spi_remove (struct platform_device *pdev) { -pm_runtime_disable (&pdev->dev); +pm_runtime_force_suspend (&pdev->dev);return 0 ; }
drivers/usb/usbip/stub_dev.c +3 -0
@@ -87,6 +87,7 @@ static ssize_t store_sockfd(struct device *dev, struct device_attribute *attr, goto err; sdev->ud.tcp_socket = socket; + sdev->ud.sockfd = sockfd;spin_unlock_irq (&sdev->ud.lock);
@@ -186,6 +187,7 @@ static void stub_shutdown_connection(struct usbip_device *ud)if (ud->tcp_socket) {sockfd_put (ud->tcp_socket); ud->tcp_socket =NULL ; + ud->sockfd =-1 ; }/* 3. free used data */
@@ -280,6 +282,7 @@ static struct stub_device *stub_device_alloc(struct usb_device *udev) sdev->ud.status =SDEV_ST_AVAILABLE ;spin_lock_init (&sdev->ud.lock); sdev->ud.tcp_socket =NULL ; + sdev->ud.sockfd =-1 ;INIT_LIST_HEAD (&sdev->priv_init);INIT_LIST_HEAD (&sdev->priv_tx);
drivers/usb/usbip/vhci_hcd.c +2 -0
@@ -791,6 +791,7 @@ static void vhci_shutdown_connection(struct usbip_device *ud)if (vdev->ud.tcp_socket) {sockfd_put (vdev->ud.tcp_socket); vdev->ud.tcp_socket =NULL ; + vdev->ud.sockfd =-1 ; }pr_info ("release socket\n" );
@@ -839,6 +840,7 @@ static void vhci_device_reset(struct usbip_device *ud)if (ud->tcp_socket) {sockfd_put (ud->tcp_socket); ud->tcp_socket =NULL ; + ud->sockfd =-1 ; } ud->status =VDEV_ST_NULL ;
drivers/video/console/dummycon.c +0 -1
@@ -71,7 +71,6 @@ const struct consw dummy_con = { .con_switch = DUMMY, .con_blank = DUMMY, .con_font_set = DUMMY, - .con_font_get = DUMMY, .con_font_default = DUMMY, .con_font_copy = DUMMY, .con_set_palette = DUMMY,
drivers/video/fbdev/atmel_lcdfb.c +7 -1
@@ -1121,7 +1121,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) goto put_display_node; } - timings_np =of_find_node_by_name (display_np,"display-timings" ); + timings_np =of_get_child_by_name (display_np,"display-timings" );if (!timings_np) {dev_err (dev,"failed to find display-timings node\n" ); ret = -ENODEV ;
@@ -1142,6 +1142,12 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)fb_add_videomode (&fb_vm, &info->modelist); } +/* +* FIXME: Make sure we are not referencing any fields in display_np +* and timings_np and drop our references to them before returning to +* avoid leaking the nodes on probe deferral and driver unbind. +*/ +return 0 ; put_timings_node:
drivers/video/fbdev/mmp/core.c +5 -0
@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/dma-mapping.h> #include <linux/export.h> +#include <linux/module.h> #include <video/mmp_disp.h> static struct mmp_overlay *path_get_overlay(struct mmp_path *path,
@@ -249,3 +250,7 @@ void mmp_unregister_path(struct mmp_path *path)mutex_unlock (&disp_lock); }EXPORT_SYMBOL_GPL (mmp_unregister_path); + +MODULE_AUTHOR ("Zhou Zhu <[email protected]>" ); +MODULE_DESCRIPTION ("Marvell MMP display framework" ); +MODULE_LICENSE ("GPL" );
drivers/xen/Kconfig +1 -1
@@ -222,7 +222,7 @@ config XEN_ACPI_HOTPLUG_CPU config XEN_ACPI_PROCESSOR tristate "Xen ACPI processor" - depends on XEN && X86 && ACPI_PROCESSOR && CPU_FREQ + depends on XEN && XEN_DOM0 && X86 && ACPI_PROCESSOR && CPU_FREQ default m help This ACPI processor uploads Power Management information to the Xen
fs/btrfs/inode.c +4 -1
@@ -1256,8 +1256,11 @@ next_slot: leaf = path->nodes[0 ];if (path->slots[0 ] >=btrfs_header_nritems (leaf)) { ret =btrfs_next_leaf (root, path); -if (ret <0 ) +if (ret <0 ) { +if (cow_start != (u64)-1 ) + cur_offset = cow_start; goto error; + }if (ret >0 )break ; leaf = path->nodes[0 ];
fs/btrfs/ioctl.c +1 -1
@@ -2233,7 +2233,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,if (!path)return -ENOMEM ; - ptr = &name[BTRFS_INO_LOOKUP_PATH_MAX ]; + ptr = &name[BTRFS_INO_LOOKUP_PATH_MAX -1 ]; key.objectid = tree_id; key.type =BTRFS_ROOT_ITEM_KEY ;
fs/btrfs/tree-log.c +9 -0
@@ -2201,6 +2201,9 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,clean_tree_block (trans, root, next);btrfs_wait_tree_block_writeback (next);btrfs_tree_unlock (next); + }else { +if (test_and_clear_bit (EXTENT_BUFFER_DIRTY , &next->bflags)) +clear_extent_buffer_dirty (next); } WARN_ON(root_owner !=
@@ -2279,6 +2282,9 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,clean_tree_block (trans, root, next);btrfs_wait_tree_block_writeback (next);btrfs_tree_unlock (next); + }else { +if (test_and_clear_bit (EXTENT_BUFFER_DIRTY , &next->bflags)) +clear_extent_buffer_dirty (next); }WARN_ON (root_owner !=BTRFS_TREE_LOG_OBJECTID );
@@ -2355,6 +2361,9 @@ static int walk_log_tree(struct btrfs_trans_handle *trans,clean_tree_block (trans, log, next);btrfs_wait_tree_block_writeback (next);btrfs_tree_unlock (next); + }else { +if (test_and_clear_bit (EXTENT_BUFFER_DIRTY , &next->bflags)) +clear_extent_buffer_dirty (next); } WARN_ON(log->root_key.objectid !=
fs/ext4/super.c +1 -0
@@ -677,6 +677,7 @@ __acquires(bitlock) }ext4_unlock_group (sb, grp); +ext4_commit_super (sb,1 );ext4_handle_error (sb);/* * We only get here in the ERRORS_RO case; relocking the group
include/linux/string.h +1 -0
@@ -121,6 +121,7 @@ void *memchr_inv(const void *s, int c, size_t n);extern char *kstrdup (const char *s,gfp_t gfp);extern char *kstrndup (const char *s,size_t len,gfp_t gfp);extern void *kmemdup (const void *src,size_t len,gfp_t gfp); +extern char *kmemdup_nul (const char *s,size_t len,gfp_t gfp);extern char **argv_split (gfp_t gfp,const char *str,int *argcp);extern void argv_free (char **argv);
include/net/red.h +12 -1
@@ -167,6 +167,17 @@ static inline void red_set_vars(struct red_vars *v) v->qcount =-1 ; } +static inline bool red_check_params (u32 qth_min,u32 qth_max,u8 Wlog) +{ +if (fls (qth_min) + Wlog >32 ) +return false; +if (fls (qth_max) + Wlog >32 ) +return false; +if (qth_max < qth_min) +return false; +return true; +} +static inline void red_set_parms (struct red_parms *p,u32 qth_min,u32 qth_max,u8 Wlog,u8 Plog,u8 Scell_log,u8 *stab,u32 max_P)
@@ -178,7 +189,7 @@ static inline void red_set_parms(struct red_parms *p, p->qth_max = qth_max << Wlog; p->Wlog = Wlog; p->Plog = Plog; -if (delta <0 ) +if (delta <=0 ) delta =1 ; p->qth_delta = delta;if (!max_P) {
lib/oid_registry.c +6 -2
@@ -116,7 +116,7 @@ int sprint_oid(const void *data, size_t datasize, char *buffer, size_t bufsize)int count;if (v >= end) -return -EBADMSG ; + goto bad; n = *v++; ret = count =snprintf (buffer, bufsize,"%u.%u" , n /40 , n %40 );
@@ -134,7 +134,7 @@ int sprint_oid(const void *data, size_t datasize, char *buffer, size_t bufsize) num = n &0x7f ; do { if (v >= end) - return -EBADMSG; + goto bad; n = *v++; num <<= 7; num |= n & 0x7f;
@@ -148,6 +148,10 @@ int sprint_oid(const void *data, size_t datasize, char *buffer, size_t bufsize) }return ret; + +bad: +snprintf (buffer, bufsize,"(bad)" ); +return -EBADMSG ; }EXPORT_SYMBOL_GPL (sprint_oid);
mm/early_ioremap.c +1 -1
@@ -102,7 +102,7 @@ __early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot)enum fixed_addresses idx;int i, slot; -WARN_ON (system_state !=SYSTEM_BOOTING ); +WARN_ON (system_state >=SYSTEM_RUNNING ); slot =-1 ;for (i =0 ; i <FIX_BTMAPS_SLOTS ; i++) {
mm/util.c +24 -0
@@ -42,6 +42,8 @@ EXPORT_SYMBOL(kstrdup);* @s: the string to duplicate * @max: read at most @max chars from @s * @gfp: the GFP mask used in the kmalloc() call when allocating memory +* +* Note: Use kmemdup_nul() instead if the size is known exactly. */ char *kstrndup (const char *s,size_t max,gfp_t gfp) {
@@ -79,6 +81,28 @@ void *kmemdup(const void *src, size_t len, gfp_t gfp) }EXPORT_SYMBOL (kmemdup); +/** +* kmemdup_nul - Create a NUL-terminated string from unterminated data +* @s: The data to stringify +* @len: The size of the data +* @gfp: the GFP mask used in the kmalloc() call when allocating memory +*/ +char *kmemdup_nul (const char *s,size_t len,gfp_t gfp) +{ +char *buf; + +if (!s) +return NULL ; + + buf =kmalloc_track_caller (len +1 , gfp); +if (buf) { +memcpy (buf, s, len); + buf[len] ='\0' ; + } +return buf; +} +EXPORT_SYMBOL (kmemdup_nul); +/** * memdup_user - duplicate memory region from user space *
mm/vmscan.c +3 -0
@@ -220,10 +220,13 @@ EXPORT_SYMBOL(register_shrinker);*/ void unregister_shrinker (struct shrinker *shrinker) { +if (!shrinker->nr_deferred) +return ;down_write (&shrinker_rwsem);list_del (&shrinker->list);up_write (&shrinker_rwsem);kfree (shrinker->nr_deferred); + shrinker->nr_deferred =NULL ; }EXPORT_SYMBOL (unregister_shrinker);
net/core/dev.c +1 -1
@@ -2478,7 +2478,7 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb, segs =skb_mac_gso_segment (skb, features); -if (unlikely (skb_needs_check (skb, tx_path))) +if (unlikely (skb_needs_check (skb, tx_path) && !IS_ERR (segs)))skb_warn_bad_offload (skb);return segs;
net/decnet/af_decnet.c +33 -29
98 lines not on this page · raw message
net/ipv4/ip_sockglue.c +4 -10
@@ -1090,11 +1090,8 @@ int ip_setsockopt(struct sock *sk, int level,if (err == -ENOPROTOOPT && optname !=IP_HDRINCL && optname !=IP_IPSEC_POLICY && optname !=IP_XFRM_POLICY && - !ip_mroute_opt (optname)) { -lock_sock (sk); + !ip_mroute_opt (optname)) err =nf_setsockopt (sk,PF_INET , optname, optval, optlen); -release_sock (sk); - }#endif return err; }
@@ -1119,12 +1116,9 @@ int compat_ip_setsockopt(struct sock *sk, int level, int optname,if (err == -ENOPROTOOPT && optname !=IP_HDRINCL && optname !=IP_IPSEC_POLICY && optname !=IP_XFRM_POLICY && - !ip_mroute_opt (optname)) { -lock_sock (sk); - err =compat_nf_setsockopt (sk,PF_INET , optname, - optval, optlen); -release_sock (sk); - } + !ip_mroute_opt (optname)) + err =compat_nf_setsockopt (sk,PF_INET , optname, optval, + optlen);#endif return err; }
net/ipv4/netfilter/ipt_CLUSTERIP.c +13 -3
@@ -365,7 +365,7 @@ static int clusterip_tg_check(const struct xt_tgchk_param *par)struct ipt_clusterip_tgt_info *cipinfo = par->targinfo;const struct ipt_entry *e = par->entryinfo;struct clusterip_config *config; -int ret; +int ret, i; if (cipinfo->hash_mode != CLUSTERIP_HASHMODE_SIP && cipinfo->hash_mode != CLUSTERIP_HASHMODE_SIP_SPT &&
@@ -379,8 +379,18 @@ static int clusterip_tg_check(const struct xt_tgchk_param *par)pr_info ("Please specify destination IP\n" );return -EINVAL ; } - -/* FIXME: further sanity checks */ +if (cipinfo->num_local_nodes >ARRAY_SIZE (cipinfo->local_nodes)) { +pr_info ("bad num_local_nodes %u\n" , cipinfo->num_local_nodes); +return -EINVAL ; + } +for (i =0 ; i < cipinfo->num_local_nodes; i++) { +if (cipinfo->local_nodes[i] -1 >= +sizeof (config->local_nodes) *8 ) { +pr_info ("bad local_nodes[%d] %u\n" , + i, cipinfo->local_nodes[i]); +return -EINVAL ; + } + } config =clusterip_config_find_get (par->net, e->ip.dst.s_addr,1 );if (!config) {
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +5 -1
@@ -269,15 +269,19 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len)struct nf_conntrack_tuple tuple;memset (&tuple,0 ,sizeof (tuple)); + +lock_sock (sk); tuple.src.u3.ip = inet->inet_rcv_saddr; tuple.src.u.tcp.port = inet->inet_sport; tuple.dst.u3.ip = inet->inet_daddr; tuple.dst.u.tcp.port = inet->inet_dport; tuple.src.l3num =PF_INET ; tuple.dst.protonum = sk->sk_protocol; +release_sock (sk);/* We only do TCP and SCTP at the moment: is there a better way? */ -if (sk->sk_protocol !=IPPROTO_TCP && sk->sk_protocol !=IPPROTO_SCTP ) { +if (tuple.dst.protonum !=IPPROTO_TCP && + tuple.dst.protonum !=IPPROTO_SCTP ) {pr_debug ("SO_ORIGINAL_DST: Not a TCP/SCTP socket\n" );return -ENOPROTOOPT ; }
net/ipv6/ipv6_sockglue.c +5 -12
@@ -875,12 +875,8 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname,#ifdef CONFIG_NETFILTER /* we need to exclude all possible ENOPROTOOPTs except default case */ if (err == -ENOPROTOOPT && optname !=IPV6_IPSEC_POLICY && - optname !=IPV6_XFRM_POLICY ) { -lock_sock (sk); - err =nf_setsockopt (sk,PF_INET6 , optname, optval, - optlen); -release_sock (sk); - } + optname !=IPV6_XFRM_POLICY ) + err =nf_setsockopt (sk,PF_INET6 , optname, optval, optlen);#endif return err; }
@@ -910,12 +906,9 @@ int compat_ipv6_setsockopt(struct sock *sk, int level, int optname,#ifdef CONFIG_NETFILTER /* we need to exclude all possible ENOPROTOOPTs except default case */ if (err == -ENOPROTOOPT && optname !=IPV6_IPSEC_POLICY && - optname !=IPV6_XFRM_POLICY ) { -lock_sock (sk); - err =compat_nf_setsockopt (sk,PF_INET6 , optname, - optval, optlen); -release_sock (sk); - } + optname !=IPV6_XFRM_POLICY ) + err =compat_nf_setsockopt (sk,PF_INET6 , optname, optval, + optlen);#endif return err; }
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +12 -6
@@ -240,20 +240,27 @@ static struct nf_hook_ops ipv6_conntrack_ops[] __read_mostly = {static int ipv6_getorigdst (struct sock *sk,int optval,void __user *user,int *len) { -const struct inet_sock *inet =inet_sk (sk); +struct nf_conntrack_tuple tuple = { .src.l3num =NFPROTO_IPV6 };const struct ipv6_pinfo *inet6 =inet6_sk (sk); +const struct inet_sock *inet =inet_sk (sk);const struct nf_conntrack_tuple_hash *h;struct sockaddr_in6 sin6; -struct nf_conntrack_tuple tuple = { .src.l3num =NFPROTO_IPV6 };struct nf_conn *ct; +__be32 flow_label; +int bound_dev_if; +lock_sock (sk); tuple.src.u3.in6 = sk->sk_v6_rcv_saddr; tuple.src.u.tcp.port = inet->inet_sport; tuple.dst.u3.in6 = sk->sk_v6_daddr; tuple.dst.u.tcp.port = inet->inet_dport; tuple.dst.protonum = sk->sk_protocol; + bound_dev_if = sk->sk_bound_dev_if; + flow_label = inet6->flow_label; +release_sock (sk); -if (sk->sk_protocol !=IPPROTO_TCP && sk->sk_protocol !=IPPROTO_SCTP ) +if (tuple.dst.protonum !=IPPROTO_TCP && + tuple.dst.protonum !=IPPROTO_SCTP )return -ENOPROTOOPT ;if (*len <0 || (unsigned int ) *len <sizeof (sin6))
@@ -271,14 +278,13 @@ ipv6_getorigdst(struct sock *sk, int optval, void __user *user, int *len) sin6.sin6_family =AF_INET6 ; sin6.sin6_port = ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.dst.u.tcp.port; - sin6.sin6_flowinfo = inet6->flow_label &IPV6_FLOWINFO_MASK ; + sin6.sin6_flowinfo = flow_label &IPV6_FLOWINFO_MASK ;memcpy (&sin6.sin6_addr, &ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.dst.u3.in6,sizeof (sin6.sin6_addr));nf_ct_put (ct); - sin6.sin6_scope_id =ipv6_iface_scope_id (&sin6.sin6_addr, - sk->sk_bound_dev_if); + sin6.sin6_scope_id =ipv6_iface_scope_id (&sin6.sin6_addr, bound_dev_if);return copy_to_user (user, &sin6,sizeof (sin6)) ? -EFAULT :0 ; }
net/netfilter/x_tables.c +7 -3
@@ -38,8 +38,6 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Harald Welte <[email protected]>" );MODULE_DESCRIPTION ("{ip,ip6,arp,eb}_tables backend module" ); -#define SMP_ALIGN (x) (((x) + SMP_CACHE_BYTES-1) & ~(SMP_CACHE_BYTES-1)) -struct compat_delta {unsigned int offset;/* offset in kernel */ int delta;/* delta in 32bit user land */
@@ -211,6 +209,9 @@ xt_request_find_match(uint8_t nfproto, const char *name, uint8_t revision) {struct xt_match *match; +if (strnlen (name,XT_EXTENSION_MAXNAMELEN ) ==XT_EXTENSION_MAXNAMELEN ) +return ERR_PTR (-EINVAL ); + match =xt_find_match (nfproto, name, revision);if (IS_ERR (match)) {request_module ("%st_%s" , xt_prefix[nfproto], name);
@@ -253,6 +254,9 @@ struct xt_target *xt_request_find_target(u8 af, const char *name, u8 revision) {struct xt_target *target; +if (strnlen (name,XT_EXTENSION_MAXNAMELEN ) ==XT_EXTENSION_MAXNAMELEN ) +return ERR_PTR (-EINVAL ); + target =xt_find_target (af, name, revision);if (IS_ERR (target)) {request_module ("%st_%s" , xt_prefix[af], name);
@@ -951,7 +955,7 @@ struct xt_table_info *xt_alloc_table_info(unsigned int size)int cpu;/* Pedantry: prevent them from hitting BUG() in vmalloc.c --RR */ -if ((SMP_ALIGN (size) >>PAGE_SHIFT ) +2 > totalram_pages) +if ((size >>PAGE_SHIFT ) +2 > totalram_pages)return NULL ; newinfo =kzalloc (XT_TABLE_INFO_SZ ,GFP_KERNEL );
net/netfilter/xt_RATEEST.c +17 -5
@@ -40,23 +40,31 @@ static void xt_rateest_hash_insert(struct xt_rateest *est)hlist_add_head (&est->list, &rateest_hash[h]); } -struct xt_rateest *xt_rateest_lookup (const char *name) +static struct xt_rateest *__xt_rateest_lookup (const char *name) {struct xt_rateest *est;unsigned int h; h =xt_rateest_hash (name); -mutex_lock (&xt_rateest_mutex);hlist_for_each_entry (est, &rateest_hash[h], list) {if (strcmp (est->name, name) ==0 ) { est->refcnt++; -mutex_unlock (&xt_rateest_mutex);return est; } } -mutex_unlock (&xt_rateest_mutex); +return NULL ; } + +struct xt_rateest *xt_rateest_lookup (const char *name) +{ +struct xt_rateest *est; + +mutex_lock (&xt_rateest_mutex); + est =__xt_rateest_lookup (name); +mutex_unlock (&xt_rateest_mutex); +return est; +}EXPORT_SYMBOL_GPL (xt_rateest_lookup);void xt_rateest_put (struct xt_rateest *est)
@@ -104,8 +112,10 @@ static int xt_rateest_tg_checkentry(const struct xt_tgchk_param *par) rnd_inited = true; } - est =xt_rateest_lookup (info->name); +mutex_lock (&xt_rateest_mutex); + est =__xt_rateest_lookup (info->name);if (est) { +mutex_unlock (&xt_rateest_mutex);/* * If estimator parameters are specified, they must match the * existing estimator.
@@ -143,11 +153,13 @@ static int xt_rateest_tg_checkentry(const struct xt_tgchk_param *par) info->est = est;xt_rateest_hash_insert (est); +mutex_unlock (&xt_rateest_mutex);return 0 ; err2:kfree (est); err1: +mutex_unlock (&xt_rateest_mutex);return ret; }
net/sched/sch_choke.c +3 -0
@@ -431,6 +431,9 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt) ctl =nla_data (tb[TCA_CHOKE_PARMS ]); +if (!red_check_params (ctl->qth_min, ctl->qth_max, ctl->Wlog)) +return -EINVAL ; +if (ctl->limit >CHOKE_MAX_QUEUE )return -EINVAL ;
net/sched/sch_gred.c +3 -0
@@ -388,6 +388,9 @@ static inline int gred_change_vq(struct Qdisc *sch, int dp,struct gred_sched *table =qdisc_priv (sch);struct gred_sched_data *q = table->tab[dp]; +if (!red_check_params (ctl->qth_min, ctl->qth_max, ctl->Wlog)) +return -EINVAL ; +if (!q) { table->tab[dp] = q = *prealloc; *prealloc =NULL ;
net/sched/sch_red.c +2 -0
@@ -199,6 +199,8 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt) max_P = tb[TCA_RED_MAX_P ] ?nla_get_u32 (tb[TCA_RED_MAX_P ]) :0 ; ctl =nla_data (tb[TCA_RED_PARMS ]); +if (!red_check_params (ctl->qth_min, ctl->qth_max, ctl->Wlog)) +return -EINVAL ;if (ctl->limit >0 ) { child =fifo_create_dflt (sch, &bfifo_qdisc_ops, ctl->limit);
net/sched/sch_sfq.c +3 -0
@@ -653,6 +653,9 @@ static int sfq_change(struct Qdisc *sch, struct nlattr *opt)if (ctl->divisor && (!is_power_of_2 (ctl->divisor) || ctl->divisor >65536 ))return -EINVAL ; +if (ctl_v1 && !red_check_params (ctl_v1->qth_min, ctl_v1->qth_max, + ctl_v1->Wlog)) +return -EINVAL ;if (ctl_v1 && ctl_v1->qth_min) { p =kmalloc (sizeof (*p),GFP_KERNEL );if (!p)
net/xfrm/xfrm_user.c +24 -0
@@ -1349,11 +1349,14 @@ static void copy_templates(struct xfrm_policy *xp, struct xfrm_user_tmpl *ut,static int validate_tmpl (int nr,struct xfrm_user_tmpl *ut,u16 family) { +u16 prev_family;int i;if (nr >XFRM_MAX_DEPTH )return -EINVAL ; + prev_family = family; +for (i =0 ; i < nr; i++) {/* We never validated the ut->family value, so many * applications simply leave it at zero. The check was
@@ -1365,6 +1368,12 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family)if (!ut[i].family) ut[i].family = family; +if ((ut[i].mode ==XFRM_MODE_TRANSPORT ) && + (ut[i].family != prev_family)) +return -EINVAL ; + + prev_family = ut[i].family; +switch (ut[i].family) {case AF_INET :break ;
@@ -1375,6 +1384,21 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family)default :return -EINVAL ; } + +switch (ut[i].id.proto) { +case IPPROTO_AH : +case IPPROTO_ESP : +case IPPROTO_COMP : +#if IS_ENABLED (CONFIG_IPV6 ) +case IPPROTO_ROUTING : +case IPPROTO_DSTOPTS : +#endif +case IPSEC_PROTO_ANY : +break ; +default : +return -EINVAL ; + } + }return 0 ;
scripts/kernel-doc +1 -1
@@ -2616,4 +2616,4 @@ if ($verbose && $warnings) { print STDERR "$warnings warnings\n"; } -exit($errors); +exit($output_mode eq "none" ? 0 : $errors);
security/selinux/ss/services.c +11 -10
@@ -823,6 +823,9 @@ int security_bounded_transition(u32 old_sid, u32 new_sid)int index;int rc; +if (!ss_initialized) +return 0 ; +read_lock (&policy_rwlock); rc = -EINVAL ;
@@ -1236,27 +1239,25 @@ static int security_context_to_sid_core(const char *scontext, u32 scontext_len,if (!scontext_len)return -EINVAL ; +/* Copy the string to allow changes and ensure a NUL terminator */ + scontext2 =kmemdup_nul (scontext, scontext_len, gfp_flags); +if (!scontext2) +return -ENOMEM ; +if (!ss_initialized) {int i;for (i =1 ; i <SECINITSID_NUM ; i++) { -if (!strcmp (initial_sid_to_string[i], scontext)) { +if (!strcmp (initial_sid_to_string[i], scontext2)) { *sid = i; -return 0 ; + goto out; } } *sid =SECINITSID_KERNEL ; -return 0 ; + goto out; } *sid =SECSID_NULL ; -/* Copy the string so that we can modify the copy as we parse it. */ - scontext2 =kmalloc (scontext_len +1 , gfp_flags); -if (!scontext2) -return -ENOMEM ; -memcpy (scontext2, scontext, scontext_len); - scontext2[scontext_len] =0 ; -if (force) {/* Save another copy for storing in uninterpreted form */ rc = -ENOMEM ;
sound/core/seq/seq_clientmgr.c +13 -10
@@ -1012,7 +1012,7 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf, {struct snd_seq_client *client = file->private_data;int written =0 , len; -int err = -EINVAL ; +int err;struct snd_seq_event event;if (!(snd_seq_file_flags (file) &SNDRV_SEQ_LFLG_OUTPUT ))
@@ -1027,11 +1027,15 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf,/* allocate the pool now if the pool is not allocated yet */ if (client->pool->size >0 && !snd_seq_write_pool_allocated (client)) { -if (snd_seq_pool_init (client->pool) <0 ) +mutex_lock (&client->ioctl_mutex); + err =snd_seq_pool_init (client->pool); +mutex_unlock (&client->ioctl_mutex); +if (err <0 )return -ENOMEM ; }/* only process whole events */ + err = -EINVAL ;while (count >=sizeof (struct snd_seq_event )) {/* Read in the event header from the user */ len =sizeof (event);
@@ -2201,7 +2205,6 @@ static int snd_seq_do_ioctl(struct snd_seq_client *client, unsigned int cmd, void __user *arg) {struct seq_ioctl_table *p; -int ret;switch (cmd) {case SNDRV_SEQ_IOCTL_PVERSION :
@@ -2215,12 +2218,8 @@ static int snd_seq_do_ioctl(struct snd_seq_client *client, unsigned int cmd,if (! arg)return -EFAULT ;for (p = ioctl_tables; p->cmd; p++) { -if (p->cmd == cmd) { -mutex_lock (&client->ioctl_mutex); - ret = p->func (client, arg); -mutex_unlock (&client->ioctl_mutex); -return ret; - } +if (p->cmd == cmd) +return p->func (client, arg); }pr_debug ("ALSA: seq unknown ioctl() 0x%x (type='%c', number=0x%02x)\n" , cmd,_IOC_TYPE (cmd),_IOC_NR (cmd));
@@ -2231,11 +2230,15 @@ static int snd_seq_do_ioctl(struct snd_seq_client *client, unsigned int cmd,static long snd_seq_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {struct snd_seq_client *client = file->private_data; +long ret;if (snd_BUG_ON (!client))return -ENXIO ; -return snd_seq_do_ioctl (client, cmd, (void __user *) arg); +mutex_lock (&client->ioctl_mutex); + ret =snd_seq_do_ioctl (client, cmd, (void __user *) arg); +mutex_unlock (&client->ioctl_mutex); +return ret; }#ifdef CONFIG_COMPAT
sound/soc/ux500/mop500.c +4 -0
@@ -168,3 +168,7 @@ static struct platform_driver snd_soc_mop500_driver = { };module_platform_driver (snd_soc_mop500_driver); + +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("ASoC MOP500 board driver" ); +MODULE_AUTHOR ("Ola Lilja" );
sound/soc/ux500/ux500_pcm.c +5 -0
@@ -166,3 +166,8 @@ int ux500_pcm_unregister_platform(struct platform_device *pdev)return 0 ; }EXPORT_SYMBOL_GPL (ux500_pcm_unregister_platform); + +MODULE_AUTHOR ("Ola Lilja" ); +MODULE_AUTHOR ("Roger Nilsson" ); +MODULE_DESCRIPTION ("ASoC UX500 driver" ); +MODULE_LICENSE ("GPL v2" );
tools/perf/bench/numa.c +51 -5
97 lines not on this page · raw message
tools/perf/builtin-top.c +12 -3
@@ -70,6 +70,7 @@#include <linux/types.h> static volatile int done; +static volatile int resize;#define HEADER_LINE_NR 5
@@ -79,10 +80,13 @@ static void perf_top__update_print_entries(struct perf_top *top) }static void perf_top__sig_winch (int sig__maybe_unused , -siginfo_t *info__maybe_unused ,void *arg) +siginfo_t *info__maybe_unused ,void *arg__maybe_unused ) { -struct perf_top *top = arg; + resize =1 ; +} +static void perf_top__resize (struct perf_top *top) +{get_term_dimensions (&top->winsize);perf_top__update_print_entries (top); }
@@ -461,7 +465,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c) .sa_sigaction = perf_top__sig_winch, .sa_flags = SA_SIGINFO, }; -perf_top__sig_winch (SIGWINCH ,NULL , top); +perf_top__resize (top);sigaction (SIGWINCH , &act,NULL ); }else {signal (SIGWINCH ,SIG_DFL );
@@ -997,6 +1001,11 @@ static int __cmd_top(struct perf_top *top)if (hits == top->samples) ret =perf_evlist__poll (top->evlist,100 ); + +if (resize) { +perf_top__resize (top); + resize =0 ; + } } ret =0 ;
Quoted 11 lines · Greg KH,
I'm announcing the release of the 3.18.96 kernel.
All users of the 3.18 kernel series must upgrade.
The updated 3.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.18.y
and can be browsed at the normal kernel.org git web browser:http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
No regressions on the OnePlus 3. Merged cleanly into CAF msm-3.18 tree.
Thanks,
Harsh Shandilya