Linux 3.18.81
Greg KH
maintainerI'm announcing the release of the 3.18.81 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/arm/davinci.txt | 4 + Documentation/devicetree/bindings/vendor-prefixes.txt | 1 Makefile | 2 arch/arm/boot/dts/imx53-qsb-common.dtsi | 20 ++--- arch/arm/configs/omap2plus_defconfig | 1 arch/arm/kernel/traps.c | 28 ++++--- arch/mips/ar7/platform.c | 1 arch/mips/include/asm/mips-cm.h | 4 - arch/mips/mm/uasm-micromips.c | 2 arch/sh/kernel/cpu/sh3/setup-sh770x.c | 1 arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S | 12 +-- arch/x86/oprofile/op_model_ppro.c | 4 - drivers/block/rbd.c | 4 - drivers/gpu/drm/drm_drv.c | 2 drivers/iio/trigger/iio-trig-interrupt.c | 8 +- drivers/iio/trigger/iio-trig-sysfs.c | 2 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 drivers/input/keyboard/mpr121_touchkey.c | 24 +++--- drivers/net/can/c_can/c_can_pci.c | 1 drivers/net/can/c_can/c_can_platform.c | 1 drivers/net/xen-netback/netback.c | 6 + drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 4 - drivers/tty/serial/sh-sci.c | 17 ++-- drivers/usb/core/hcd.c | 1 drivers/video/fbdev/pmag-ba-fb.c | 2 include/linux/phy.h | 8 -- include/sound/seq_kernel.h | 3 lib/asn1_decoder.c | 4 - net/ipv4/ah4.c | 3 security/keys/trusted.c | 70 ++++++++---------- sound/core/seq/oss/seq_oss_midi.c | 4 - sound/core/seq/oss/seq_oss_readq.c | 29 +++++++ sound/core/seq/oss/seq_oss_readq.h | 2 33 files changed, 161 insertions(+), 116 deletions(-)
Akinobu Mita (2):
Input: mpr121 - handle multiple bits change of status register
Input: mpr121 - set missing event capability
Alison Schofield (1):
iio: trigger: free trigger resource correctly
Andrey Ryabinin (1):
crypto: x86/sha1-mb - fix panic due to unaligned access
Borislav Petkov (1):
x86/oprofile/ppro: Do not use __this_cpu*() in preemptible context
David Lechner (2):
dt-bindings: Add LEGO MINDSTORMS EV3 compatible specification
dt-bindings: Add vendor prefix for LEGO
Eric Biggers (3):
KEYS: trusted: sanitize all key material
KEYS: trusted: fix writing past end of buffer in trusted_read()
KEYS: fix NULL pointer dereference during ASN.1 parsing [ver #2]
Feras Daoud (1):
IB/ipoib: Change list_del to list_del_init in the tx object
Gilad Ben-Yossef (1):
IPsec: do not ignore crypto err in ah4 input
Greg Kroah-Hartman (1):
Linux 3.18.81
Gustavo A. R. Silva (1):
MIPS: microMIPS: Fix incorrect mask in insn_table_MM
Ilya Dryomov (1):
rbd: use GFP_NOIO for parent stat and data requests
Juergen Gross (1):
xen/netback: set default upper limit of tx/rx queues to 8
Laurent Pinchart (1):
serial: sh-sci: Fix register offsets for the IRDA serial port
Maciej W. Rozycki (1):
video: fbdev: pmag-ba-fb: Remove bad `__init' annotation
Mark Rutland (1):
ARM: 8720/1: ensure dump_instr() checks addr_limit
Noralf Trønnes (1):
drm: drm_minor_register(): Clean up debugfs on failure
Oswald Buddenhagen (1):
MIPS: AR7: Ensure that serial ports are properly set up
Patrick Bruenn (1):
ARM: dts: imx53-qsb-common: fix FEC pinmux config
Paul Burton (1):
MIPS: Fix CM region target definitions
Richard Schütz (1):
can: c_can: don't indicate triple sampling support for D_CAN
Takashi Iwai (2):
ALSA: seq: Fix OSS sysex delivery in OSS emulation
ALSA: seq: Avoid invalid lockdep class warning
Tony Lindgren (1):
ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
Volodymyr Bendiuga (1):
phy: increase size of MII_BUS_ID_SIZE and bus_id
William wu (1):
usb: hcd: initialize hcd->flags to 0 when rm hcd
Greg KH
maintainerDocumentation/devicetree/bindings/arm/davinci.txt +4 -0
@@ -9,6 +9,10 @@ EnBW AM1808 based CMC board Required root node properties: - compatible = "enbw,cmc", "ti,da850; +LEGO MINDSTORMS EV3 (AM1808 based) +Required root node properties: + - compatible = "lego,ev3", "ti,da850"; + Generic DaVinci Boards ----------------------
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
@@ -83,6 +83,7 @@ karo Ka-Ro electronics GmbH keymile Keymile GmbH lacie LaCie lantiq Lantiq Semiconductor +lego LEGO Systems A/S lenovo Lenovo Group Ltd. lg LG Corporation linux Linux-specific binding
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 18 -SUBLEVEL = 80 +SUBLEVEL = 81 EXTRAVERSION = NAME = Diseased Newt
arch/arm/boot/dts/imx53-qsb-common.dtsi +10 -10
@@ -215,16 +215,16 @@ pinctrl_fec: fecgrp { fsl,pins = < - MX53_PAD_FEC_MDC__FEC_MDC 0x80000000 - MX53_PAD_FEC_MDIO__FEC_MDIO 0x80000000 - MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x80000000 - MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x80000000 - MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x80000000 - MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x80000000 - MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x80000000 - MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000 - MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x80000000 - MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x80000000 + MX53_PAD_FEC_MDC__FEC_MDC 0x4 + MX53_PAD_FEC_MDIO__FEC_MDIO 0x1fc + MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x180 + MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x180 + MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x180 + MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x180 + MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x180 + MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x4 + MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x4 + MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x4 >; };
arch/arm/configs/omap2plus_defconfig +1 -0
@@ -169,6 +169,7 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=6 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y
arch/arm/kernel/traps.c +18 -10
@@ -132,30 +132,26 @@ static void dump_mem(const char *lvl, const char *str, unsigned long bottom,set_fs (fs); } -static void dump_instr (const char *lvl,struct pt_regs *regs) +static void __dump_instr (const char *lvl,struct pt_regs *regs) {unsigned long addr =instruction_pointer (regs);const int thumb =thumb_mode (regs);const int width = thumb ?4 :8 ; -mm_segment_t fs;char str[sizeof ("00000000 " ) *5 +2 +1 ], *p = str;int i;/* -* We need to switch to kernel mode so that we can use __get_user -* to safely read from kernel space. Note that we now dump the -* code first, just in case the backtrace kills us. +* Note that we now dump the code first, just in case the backtrace +* kills us. */ - fs =get_fs (); -set_fs (KERNEL_DS );for (i =-4 ; i <1 + !!thumb; i++) {unsigned int val, bad;if (thumb) - bad =__get_user (val, &((u16 *)addr)[i]); + bad =get_user (val, &((u16 *)addr)[i]);else - bad =__get_user (val, &((u32 *)addr)[i]); + bad =get_user (val, &((u32 *)addr)[i]);if (!bad) p += sprintf(p, i == 0 ? "(%0*x) " : "%0*x ",
@@ -166,8 +162,20 @@ static void dump_instr(const char *lvl, struct pt_regs *regs) } }printk ("%sCode: %s\n" , lvl, str); +} -set_fs (fs); +static void dump_instr (const char *lvl,struct pt_regs *regs) +{ +mm_segment_t fs; + +if (!user_mode (regs)) { + fs =get_fs (); +set_fs (KERNEL_DS ); +__dump_instr (lvl, regs); +set_fs (fs); + }else { +__dump_instr (lvl, regs); + } }#ifdef CONFIG_ARM_UNWIND
arch/mips/ar7/platform.c +1 -0
@@ -581,6 +581,7 @@ static int __init ar7_register_uarts(void) uart_port.type =PORT_AR7 ; uart_port.uartclk =clk_get_rate (bus_clk) /2 ; uart_port.iotype =UPIO_MEM32 ; + uart_port.flags =UPF_FIXED_TYPE ; uart_port.regshift =2 ; uart_port.line =0 ;
arch/mips/include/asm/mips-cm.h +2 -2
@@ -173,8 +173,8 @@ BUILD_CM_Cx_R_(tcid_8_priority, 0x80)#define CM_GCR_BASE_GCRBASE_MSK (_ULCAST_(0x1ffff) << 15)#define CM_GCR_BASE_CMDEFTGT_SHF 0#define CM_GCR_BASE_CMDEFTGT_MSK (_ULCAST_(0x3) << 0) -#define CM_GCR_BASE_CMDEFTGT_DISABLED 0 -#define CM_GCR_BASE_CMDEFTGT_MEM 1 +#define CM_GCR_BASE_CMDEFTGT_MEM 0 +#define CM_GCR_BASE_CMDEFTGT_RESERVED 1#define CM_GCR_BASE_CMDEFTGT_IOCU0 2#define CM_GCR_BASE_CMDEFTGT_IOCU1 3
arch/mips/mm/uasm-micromips.c +1 -1
@@ -83,7 +83,7 @@ static struct insn insn_table_MM[] = { { insn_jr, M(mm_pool32a_op, 0, 0, 0, mm_jalr_op, mm_pool32axf_op), RS }, { insn_lb, M(mm_lb32_op, 0, 0, 0, 0, 0), RT | RS | SIMM }, { insn_ld, 0, 0 }, - { insn_lh, M(mm_lh32_op, 0, 0, 0, 0, 0), RS | RS | SIMM }, + { insn_lh, M(mm_lh32_op, 0, 0, 0, 0, 0), RT | RS | SIMM }, { insn_ll, M(mm_pool32c_op, 0, 0, (mm_ll_func << 1), 0, 0), RS | RT | SIMM }, { insn_lld, 0, 0 }, { insn_lui, M(mm_pool32i_op, mm_lui_op, 0, 0, 0, 0), RS | SIMM },
arch/sh/kernel/cpu/sh3/setup-sh770x.c +0 -1
@@ -165,7 +165,6 @@ static struct plat_sci_port scif2_platform_data = { .scscr = SCSCR_TE | SCSCR_RE, .type = PORT_IRDA, .ops = &sh770x_sci_port_ops, - .regshift = 1, };static struct resource scif2_resources[] = {
arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S +6 -6
@@ -174,8 +174,8 @@ LABEL skip_ %I .endr # Find min length - vmovdqa _lens+0*16(state), %xmm0 - vmovdqa _lens+1*16(state), %xmm1 + vmovdqu _lens+0*16(state), %xmm0 + vmovdqu _lens+1*16(state), %xmm1 vpminud %xmm1, %xmm0, %xmm2 # xmm2 has {D,C,B,A} vpalignr $8, %xmm2, %xmm3, %xmm3 # xmm3 has {x,x,D,C}
@@ -195,8 +195,8 @@ LABEL skip_ %I vpsubd %xmm2, %xmm0, %xmm0 vpsubd %xmm2, %xmm1, %xmm1 - vmovdqa %xmm0, _lens+0*16(state) - vmovdqa %xmm1, _lens+1*16(state) + vmovdqu %xmm0, _lens+0*16(state) + vmovdqu %xmm1, _lens+1*16(state) # "state" and "args" are the same address, arg1 # len is arg2
@@ -260,8 +260,8 @@ ENTRY(sha1_mb_mgr_get_comp_job_avx2) jc .return_null # Find min length - vmovdqa _lens(state), %xmm0 - vmovdqa _lens+1*16(state), %xmm1 + vmovdqu _lens(state), %xmm0 + vmovdqu _lens+1*16(state), %xmm1 vpminud %xmm1, %xmm0, %xmm2 # xmm2 has {D,C,B,A} vpalignr $8, %xmm2, %xmm3, %xmm3 # xmm3 has {x,x,D,C}
arch/x86/oprofile/op_model_ppro.c +2 -2
@@ -212,8 +212,8 @@ static void arch_perfmon_setup_counters(void) eax.full =cpuid_eax (0xa );/* Workaround for BIOS bugs in 6/15. Taken from perfmon2 */ -if (eax.split.version_id ==0 &&__this_cpu_read (cpu_info.x86) ==6 && -__this_cpu_read (cpu_info.x86_model) ==15 ) { +if (eax.split.version_id ==0 && boot_cpu_data.x86 ==6 && + boot_cpu_data.x86_model ==15 ) { eax.split.version_id =2 ; eax.split.num_counters =2 ; eax.split.bit_width =40 ;
drivers/block/rbd.c +2 -2
@@ -2700,7 +2700,7 @@ static int rbd_img_obj_parent_read_full(struct rbd_obj_request *obj_request)* from the parent. */ page_count = (u32 )calc_pages_for (0 , length); - pages =ceph_alloc_page_vector (page_count,GFP_KERNEL ); + pages =ceph_alloc_page_vector (page_count,GFP_NOIO );if (IS_ERR (pages)) { result =PTR_ERR (pages); pages =NULL ;
@@ -2827,7 +2827,7 @@ static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request)*/ size =sizeof (__le64) +sizeof (__le32) +sizeof (__le32); page_count = (u32 )calc_pages_for (0 , size); - pages =ceph_alloc_page_vector (page_count,GFP_KERNEL ); + pages =ceph_alloc_page_vector (page_count,GFP_NOIO );if (IS_ERR (pages))return PTR_ERR (pages);
drivers/gpu/drm/drm_drv.c +1 -1
@@ -320,7 +320,7 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type) ret =drm_debugfs_init (minor, minor->index, drm_debugfs_root);if (ret) {DRM_ERROR ("DRM: Failed to initialize /sys/kernel/debug/dri.\n" ); -return ret; + goto err_debugfs; } ret =device_add (minor->kdev);
drivers/iio/trigger/iio-trig-interrupt.c +4 -4
@@ -58,7 +58,7 @@ static int iio_interrupt_trigger_probe(struct platform_device *pdev) trig_info =kzalloc (sizeof (*trig_info),GFP_KERNEL );if (!trig_info) { ret = -ENOMEM ; - goto error_put_trigger; + goto error_free_trigger; }iio_trigger_set_drvdata (trig, trig_info); trig_info->irq = irq;
@@ -83,8 +83,8 @@ error_release_irq:free_irq (irq, trig); error_free_trig_info:kfree (trig_info); -error_put_trigger: -iio_trigger_put (trig); +error_free_trigger: +iio_trigger_free (trig); error_ret:return ret; }
@@ -99,7 +99,7 @@ static int iio_interrupt_trigger_remove(struct platform_device *pdev)iio_trigger_unregister (trig);free_irq (trig_info->irq, trig);kfree (trig_info); -iio_trigger_put (trig); +iio_trigger_free (trig);return 0 ; }
drivers/iio/trigger/iio-trig-sysfs.c +1 -1
@@ -173,7 +173,7 @@ static int iio_sysfs_trigger_probe(int id)return 0 ; out2: -iio_trigger_put (t->trig); +iio_trigger_free (t->trig); free_t:kfree (t); out1:
drivers/infiniband/ulp/ipoib/ipoib_cm.c +1 -1
@@ -1362,7 +1362,7 @@ static void ipoib_cm_tx_reap(struct work_struct *work)while (!list_empty (&priv->cm.reap_list)) { p =list_entry (priv->cm.reap_list.next,typeof (*p), list); -list_del (&p->list); +list_del_init (&p->list);spin_unlock_irqrestore (&priv->lock, flags);netif_tx_unlock_bh (dev);ipoib_cm_tx_destroy (p);
drivers/input/keyboard/mpr121_touchkey.c +15 -9
@@ -87,7 +87,8 @@ static irqreturn_t mpr_touchkey_interrupt(int irq, void *dev_id)struct mpr121_touchkey *mpr121 = dev_id;struct i2c_client *client = mpr121->client;struct input_dev *input = mpr121->input_dev; -unsigned int key_num, key_val, pressed; +unsigned long bit_changed; +unsigned int key_num;int reg; reg =i2c_smbus_read_byte_data (client,ELE_TOUCH_STATUS_1_ADDR );
@@ -105,18 +106,22 @@ static irqreturn_t mpr_touchkey_interrupt(int irq, void *dev_id) reg &=TOUCH_STATUS_MASK ;/* use old press bit to figure out which bit changed */ - key_num =ffs (reg ^ mpr121->statusbits) -1 ; - pressed = reg & (1 << key_num); + bit_changed = reg ^ mpr121->statusbits; mpr121->statusbits = reg; +for_each_set_bit (key_num, &bit_changed, mpr121->keycount) { +unsigned int key_val, pressed; - key_val = mpr121->keycodes[key_num]; + pressed = reg &BIT (key_num); + key_val = mpr121->keycodes[key_num]; -input_event (input,EV_MSC ,MSC_SCAN , key_num); -input_report_key (input, key_val, pressed); -input_sync (input); +input_event (input,EV_MSC ,MSC_SCAN , key_num); +input_report_key (input, key_val, pressed); + +dev_dbg (&client->dev,"key %d %d %s\n" , key_num, key_val, + pressed ?"pressed" :"released" ); -dev_dbg (&client->dev,"key %d %d %s\n" , key_num, key_val, - pressed ?"pressed" :"released" ); + } +input_sync (input); out:return IRQ_HANDLED ;
@@ -230,6 +235,7 @@ static int mpr_touchkey_probe(struct i2c_client *client, input_dev->id.bustype =BUS_I2C ; input_dev->dev.parent = &client->dev; input_dev->evbit[0 ] =BIT_MASK (EV_KEY ) |BIT_MASK (EV_REP ); +input_set_capability (input_dev,EV_MSC ,MSC_SCAN ); input_dev->keycode = mpr121->keycodes; input_dev->keycodesize =sizeof (mpr121->keycodes[0 ]);
drivers/net/can/c_can/c_can_pci.c +0 -1
@@ -177,7 +177,6 @@ static int c_can_pci_probe(struct pci_dev *pdev,break ;case BOSCH_D_CAN : priv->regs = reg_map_d_can; - priv->can.ctrlmode_supported |=CAN_CTRLMODE_3_SAMPLES ;break ;default : ret = -EINVAL ;
drivers/net/can/c_can/c_can_platform.c +0 -1
@@ -257,7 +257,6 @@ static int c_can_plat_probe(struct platform_device *pdev)break ;case BOSCH_D_CAN : priv->regs = reg_map_d_can; - priv->can.ctrlmode_supported |=CAN_CTRLMODE_3_SAMPLES ; priv->read_reg = c_can_plat_read_reg_aligned_to_16bit; priv->write_reg = c_can_plat_write_reg_aligned_to_16bit; priv->read_reg32 = d_can_plat_read_reg32;
drivers/net/xen-netback/netback.c +4 -2
@@ -67,6 +67,7 @@ module_param(rx_drain_timeout_msecs, uint, 0444);unsigned int rx_stall_timeout_msecs =60000 ;module_param (rx_stall_timeout_msecs, uint,0444 ); +#define MAX_QUEUES_DEFAULT 8unsigned int xenvif_max_queues;module_param_named (max_queues, xenvif_max_queues, uint,0644 ); MODULE_PARM_DESC(max_queues,
@@ -2189,11 +2190,12 @@ static int __init netback_init(void)if (!xen_domain ())return -ENODEV ; -/* Allow as many queues as there are CPUs if user has not +/* Allow as many queues as there are CPUs but max. 8 if user has not * specified a value. */ if (xenvif_max_queues ==0 ) - xenvif_max_queues =num_online_cpus (); + xenvif_max_queues = min_t(unsigned int, MAX_QUEUES_DEFAULT, +num_online_cpus ());if (fatal_skb_slots <XEN_NETBK_LEGACY_SLOTS_MAX ) { pr_info("fatal_skb_slots too small (%d), bump it to XEN_NETBK_LEGACY_SLOTS_MAX (%d)\n",
drivers/staging/iio/trigger/iio-trig-bfin-timer.c +2 -2
@@ -258,7 +258,7 @@ out_free_irq: out1:iio_trigger_unregister (st->trig); out: -iio_trigger_put (st->trig); +iio_trigger_free (st->trig);return ret; }
@@ -271,7 +271,7 @@ static int iio_bfin_tmr_trigger_remove(struct platform_device *pdev)peripheral_free (st->t->pin);free_irq (st->irq, st);iio_trigger_unregister (st->trig); -iio_trigger_put (st->trig); +iio_trigger_free (st->trig);return 0 ; }
drivers/tty/serial/sh-sci.c +8 -9
@@ -171,18 +171,17 @@ static struct plat_sci_reg sci_regmap[SCIx_NR_REGTYPES][SCIx_NR_REGS] = { }, /* - * Common definitions for legacy IrDA ports, dependent on - * regshift value. + * Common definitions for legacy IrDA ports. */ [SCIx_IRDA_REGTYPE] = { [SCSMR] = { 0x00, 8 }, - [SCBRR] = { 0x01, 8 }, - [SCSCR] = { 0x02, 8 }, - [SCxTDR] = { 0x03, 8 }, - [SCxSR] = { 0x04, 8 }, - [SCxRDR] = { 0x05, 8 }, - [SCFCR] = { 0x06, 8 }, - [SCFDR] = { 0x07, 16 }, + [SCBRR] = { 0x02, 8 }, + [SCSCR] = { 0x04, 8 }, + [SCxTDR] = { 0x06, 8 }, + [SCxSR] = { 0x08, 16 }, + [SCxRDR] = { 0x0a, 8 }, + [SCFCR] = { 0x0c, 8 }, + [SCFDR] = { 0x0e, 16 }, [SCTFDR] = sci_reg_invalid, [SCRFDR] = sci_reg_invalid, [SCSPTR] = sci_reg_invalid,
drivers/usb/core/hcd.c +1 -0
@@ -2927,6 +2927,7 @@ void usb_remove_hcd(struct usb_hcd *hcd) }usb_put_invalidate_rhdev (hcd); + hcd->flags =0 ; }EXPORT_SYMBOL_GPL (usb_remove_hcd);
drivers/video/fbdev/pmag-ba-fb.c +1 -1
@@ -129,7 +129,7 @@ static struct fb_ops pmagbafb_ops = {/* * Turn the hardware cursor off. */ -static void __init pmagbafb_erase_cursor (struct fb_info *info) +static void pmagbafb_erase_cursor (struct fb_info *info) {struct pmagbafb_par *par = info->par;
include/linux/phy.h +2 -6
@@ -135,11 +135,7 @@ static inline const char *phy_modes(phy_interface_t interface)/* Used when trying to connect to a specific phy (mii bus id:phy device id) */ #define PHY_ID_FMT "%s:%02x" -/* -* Need to be a little smaller than phydev->dev.bus_id to leave room -* for the ":%02x" -*/ -#define MII_BUS_ID_SIZE (20 - 3) +#define MII_BUS_ID_SIZE 61/* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit IEEE 802.3ae clause 45 addressing mode used by 10GIGE phy chips. */
@@ -573,7 +569,7 @@ struct phy_driver {/* A Structure for boards to register fixups with the PHY Lib */ struct phy_fixup {struct list_head list; -char bus_id[20 ]; +char bus_id[MII_BUS_ID_SIZE +3 ];u32 phy_uid;u32 phy_uid_mask;int (*run)(struct phy_device *phydev);
include/sound/seq_kernel.h +2 -1
@@ -55,7 +55,8 @@ typedef union snd_seq_timestamp snd_seq_timestamp_t;#define SNDRV_SEQ_DEFAULT_CLIENT_EVENTS 200/* max delivery path length */ -#define SNDRV_SEQ_MAX_HOPS 10 +/* NOTE: this shouldn't be greater than MAX_LOCKDEP_SUBCLASSES */ +#define SNDRV_SEQ_MAX_HOPS 8/* max size of event size */ #define SNDRV_SEQ_MAX_EVENT_LEN 0x3fffffff
lib/asn1_decoder.c +2 -2
@@ -220,7 +220,7 @@ next_op: hdr =2 ;/* Extract a tag from the data */ -if (unlikely (dp >= datalen -1 )) +if (unlikely (datalen - dp <2 )) goto data_overrun_error; tag = data[dp++];if (unlikely ((tag &0x1f ) ==ASN1_LONG_TAG ))
@@ -266,7 +266,7 @@ next_op:int n = len -0x80 ;if (unlikely (n >2 )) goto length_too_long; -if (unlikely (dp >= datalen - n)) +if (unlikely (n > datalen - dp)) goto data_overrun_error; hdr += n;for (len =0 ; n >0 ; n--) {
net/ipv4/ah4.c +3 -0
@@ -270,6 +270,9 @@ static void ah_input_done(struct crypto_async_request *base, int err)int ihl =ip_hdrlen (skb);int ah_hlen = (ah->hdrlen +2 ) <<2 ; +if (err) + goto out; + work_iph =AH_SKB_CB (skb)->tmp; auth_data =ah_tmp_auth (work_iph, ihl); icv =ah_tmp_icv (ahp->ahash, auth_data, ahp->icv_trunc_len);
security/keys/trusted.c +33 -37
174 lines not on this page · raw message
sound/core/seq/oss/seq_oss_midi.c +1 -3
@@ -615,9 +615,7 @@ send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, struct seqif (!dp->timer->running) len =snd_seq_oss_timer_start (dp->timer);if (ev->type ==SNDRV_SEQ_EVENT_SYSEX ) { -if ((ev->flags &SNDRV_SEQ_EVENT_LENGTH_MASK ) ==SNDRV_SEQ_EVENT_LENGTH_VARIABLE ) -snd_seq_oss_readq_puts (dp->readq, mdev->seq_device, - ev->data.ext.ptr, ev->data.ext.len); +snd_seq_oss_readq_sysex (dp->readq, mdev->seq_device, ev); }else { len =snd_midi_event_decode (mdev->coder, msg,sizeof (msg), ev);if (len >0 )
sound/core/seq/oss/seq_oss_readq.c +29 -0
@@ -119,6 +119,35 @@ snd_seq_oss_readq_puts(struct seq_oss_readq *q, int dev, unsigned char *data, inreturn 0 ; } +/* +* put MIDI sysex bytes; the event buffer may be chained, thus it has +* to be expanded via snd_seq_dump_var_event(). +*/ +struct readq_sysex_ctx { +struct seq_oss_readq *readq; +int dev; +}; + +static int readq_dump_sysex (void *ptr,void *buf,int count) +{ +struct readq_sysex_ctx *ctx = ptr; + +return snd_seq_oss_readq_puts (ctx->readq, ctx->dev, buf, count); +} + +int snd_seq_oss_readq_sysex (struct seq_oss_readq *q,int dev, +struct snd_seq_event *ev) +{ +struct readq_sysex_ctx ctx = { + .readq = q, + .dev = dev + }; + +if ((ev->flags &SNDRV_SEQ_EVENT_LENGTH_MASK ) !=SNDRV_SEQ_EVENT_LENGTH_VARIABLE ) +return 0 ; +return snd_seq_dump_var_event (ev, readq_dump_sysex, &ctx); +} +/* * copy an event to input queue: * return zero if enqueued
sound/core/seq/oss/seq_oss_readq.h +2 -0
@@ -44,6 +44,8 @@ void snd_seq_oss_readq_delete(struct seq_oss_readq *q);void snd_seq_oss_readq_clear (struct seq_oss_readq *readq);unsigned int snd_seq_oss_readq_poll (struct seq_oss_readq *readq,struct file *file,poll_table *wait);int snd_seq_oss_readq_puts (struct seq_oss_readq *readq,int dev,unsigned char *data,int len); +int snd_seq_oss_readq_sysex (struct seq_oss_readq *q,int dev, +struct snd_seq_event *ev);int snd_seq_oss_readq_put_event (struct seq_oss_readq *readq,union evrec *ev);int snd_seq_oss_readq_put_timestamp (struct seq_oss_readq *readq,unsigned long curt,int seq_mode);int snd_seq_oss_readq_pick (struct seq_oss_readq *q,union evrec *rec);