Linux 2.6.32.46
Subsystems (21)
I'm announcing the release of the 2.6.32.46 kernel.
All users of the 2.6.32 series must upgrade.
The updated 2.6.32.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/longterm/linux-2.6.32.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/longterm/linux-2.6.32.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 - arch/x86/kernel/apic/x2apic_uv_x.c | 1 arch/x86/vdso/vdso32/sysenter.S | 2 - drivers/gpu/drm/ttm/ttm_bo.c | 4 ++ drivers/hwmon/ibmaem.c | 15 ++++++---- drivers/net/igb/e1000_82575.c | 1 drivers/usb/class/usbtmc.c | 2 - drivers/usb/host/pci-quirks.c | 2 - drivers/usb/serial/qcserial.c | 1 drivers/usb/storage/unusual_devs.h | 10 ++++++ fs/befs/linuxvfs.c | 23 +++++++++------ fs/fuse/dev.c | 4 ++ fs/partitions/efi.c | 9 ++++++ kernel/futex.c | 54 ++++++++++++++++++++++++++++--------- mm/vmalloc.c | 7 ++-- net/atm/br2684.c | 2 - sound/pci/ac97/ac97_patch.c | 1 sound/usb/caiaq/audio.c | 37 +++++++++++++++++++++---- sound/usb/caiaq/device.h | 1 tools/perf/util/config.c | 7 ---- 20 files changed, 135 insertions(+), 50 deletions(-)
Carolyn Wyborny (1):
igb: Fix lack of flush after register write and before delay
Chas Williams (1):
atm: br2864: sent packets truncated in VC routed mode
Clemens Ladisch (1):
mm: fix wrong vmap address calculations with odd NR_CPUS values
Daniel Mack (2):
ALSA: snd-usb-caiaq: Correct offset fields of outbound iso_frame_desc
ALSA: snd_usb_caiaq: track submitted output urbs
Daniel T Chen (1):
ALSA: ac97: Add HP Compaq dc5100 SFF(PT003AW) to Headphone Jack Sense whitelist
Greg Kroah-Hartman (1):
Linux 2.6.32.46
H. Peter Anvin (1):
x86-32, vdso: On system call restart after SYSENTER, use int $0x80
Jack Steiner (1):
x86, UV: Remove UV delay in starting slave cpus
JiSheng Zhang (1):
USB: xhci: fix OS want to own HC
Jonathan Nieder (1):
perf tools: do not look at ./config for configuration
Julia Lawall (1):
hwmon: (ibmaem) add missing kfree
Marcin Slusarz (1):
drm/ttm: fix ttm_bo_add_ttm(user) failure path
Maxim Nikulin (1):
USB: assign instead of equal in usbtmc.c
Miklos Szeredi (1):
fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message
Nick Bowler (1):
USB: usb-storage: unusual_devs entry for ARM V2M motherboard.
Shawn Bohrer (1):
futex: Fix regression with read only mappings
Timo Warns (2):
fs/partitions/efi.c: corrupted GUID partition tables can cause kernel oops
befs: Validate length of long symbolic links.
Vijay Chavan (1):
USB: Serial: Added device ID for Qualcomm Modem in Sagemcom's HiLo3G
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 32 -EXTRAVERSION = .45 +EXTRAVERSION = .46 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
arch/x86/kernel/apic/x2apic_uv_x.c +0 -1
@@ -117,7 +117,6 @@ static int __cpuinit uv_wakeup_secondary(int phys_apicid, unsigned long start_ri ((start_rip <<UVH_IPI_INT_VECTOR_SHFT ) >>12 ) |APIC_DM_INIT ;uv_write_global_mmr64 (pnode,UVH_IPI_INT , val); -mdelay (10 ); val = (1UL <<UVH_IPI_INT_SEND_SHFT ) | (phys_apicid << UVH_IPI_INT_APIC_ID_SHFT) |
arch/x86/vdso/vdso32/sysenter.S +1 -1
@@ -43,7 +43,7 @@ __kernel_vsyscall: .space 7,0x90 /* 14: System call restart point is here! (SYSENTER_RETURN-2) */ - jmp .Lenter_kernel + int $0x80 /* 16: System call normal return point is here! */ VDSO32_SYSENTER_RETURN: /* Symbol used by sysenter.c via vdso32-syms.h */ pop %ebp
drivers/gpu/drm/ttm/ttm_bo.c +3 -1
@@ -281,8 +281,10 @@ static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, bool zero_alloc) ret =ttm_tt_set_user (bo->ttm, current, bo->buffer_start, bo->num_pages); -if (unlikely (ret !=0 )) +if (unlikely (ret !=0 )) {ttm_tt_destroy (bo->ttm); + bo->ttm =NULL ; + }break ;default : printk(KERN_ERR TTM_PFX "Illegal buffer object type\n");
drivers/hwmon/ibmaem.c +10 -5
@@ -429,13 +429,15 @@ static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,aem_send_message (ipmi); res =wait_for_completion_timeout (&ipmi->read_complete,IPMI_TIMEOUT ); -if (!res) -return -ETIMEDOUT ; +if (!res) { + res = -ETIMEDOUT ; + goto out; + }if (ipmi->rx_result || ipmi->rx_msg_len != rs_size ||memcmp (&rs_resp->id, &system_x_id,sizeof (system_x_id))) { -kfree (rs_resp); -return -ENOENT ; + res = -ENOENT ; + goto out; }switch (size) {
@@ -460,8 +462,11 @@ static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,break ; } } + res =0 ; -return 0 ; +out: +kfree (rs_resp); +return res; }/* Update AEM energy registers */
drivers/net/igb/e1000_82575.c +1 -0
@@ -941,6 +941,7 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) ctrl |=E1000_CTRL_SLU ; ctrl &= ~(E1000_CTRL_FRCSPD |E1000_CTRL_FRCDPX );wr32 (E1000_CTRL , ctrl); +wrfl (); ret_val =igb_setup_serdes_link_82575 (hw);if (ret_val)
drivers/usb/class/usbtmc.c +1 -1
@@ -267,7 +267,7 @@ usbtmc_abort_bulk_in_status:dev_err (dev,"usb_bulk_msg returned %d\n" , rv); goto exit; } - }while ((actual = max_size) && + }while ((actual == max_size) && (n <USBTMC_MAX_READS_TO_CLEAR_BULK_IN ));if (actual == max_size) {
drivers/usb/host/pci-quirks.c +1 -1
@@ -444,7 +444,7 @@ static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev)/* If the BIOS owns the HC, signal that the OS wants it, and wait */ if (val &XHCI_HC_BIOS_OWNED ) { -writel (val &XHCI_HC_OS_OWNED , base + ext_cap_offset); +writel (val |XHCI_HC_OS_OWNED , base + ext_cap_offset);/* Wait for 5 seconds with 10 microsecond polling interval */ timeout = handshake(base + ext_cap_offset, XHCI_HC_BIOS_OWNED,
drivers/usb/serial/qcserial.c +1 -0
@@ -43,6 +43,7 @@ static struct usb_device_id id_table[] = { {USB_DEVICE(0x05c6, 0x9203)}, /* Generic Gobi Modem device */ {USB_DEVICE(0x05c6, 0x9222)}, /* Generic Gobi Modem device */ {USB_DEVICE(0x05c6, 0x9008)}, /* Generic Gobi QDL device */ + {USB_DEVICE(0x05c6, 0x9009)}, /* Generic Gobi Modem device */ {USB_DEVICE(0x05c6, 0x9201)}, /* Generic Gobi QDL device */ {USB_DEVICE(0x05c6, 0x9221)}, /* Generic Gobi QDL device */ {USB_DEVICE(0x05c6, 0x9231)}, /* Generic Gobi QDL device */
drivers/usb/storage/unusual_devs.h +10 -0
@@ -1977,6 +1977,16 @@ UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, "Micro Mini 1GB", US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ), +/* +* Nick Bowler <[email protected]> +* SCSI stack spams (otherwise harmless) error messages. +*/ +UNUSUAL_DEV (0xc251 ,0x4003 ,0x0100 ,0x0100 , +"Keil Software, Inc." , +"V2M MotherBoard" , +US_SC_DEVICE ,US_PR_DEVICE ,NULL , +US_FL_NOT_LOCKABLE ), +/* Reported by Andrew Simmons <[email protected]> */ UNUSUAL_DEV( 0xed06, 0x4500, 0x0001, 0x0001, "DataStor",
fs/befs/linuxvfs.c +14 -9
@@ -469,17 +469,22 @@ befs_follow_link(struct dentry *dentry, struct nameidata *nd)befs_data_stream *data = &befs_ino->i_data.ds;befs_off_t len = data->size; -befs_debug (sb,"Follow long symlink" ); - - link =kmalloc (len,GFP_NOFS ); -if (!link) { - link =ERR_PTR (-ENOMEM ); - }else if (befs_read_lsymlink (sb, data, link, len) != len) { -kfree (link); -befs_error (sb,"Failed to read entire long symlink" ); +if (len ==0 ) { +befs_error (sb,"Long symlink with illegal length" ); link =ERR_PTR (-EIO ); }else { - link[len -1 ] ='\0' ; +befs_debug (sb,"Follow long symlink" ); + + link =kmalloc (len,GFP_NOFS ); +if (!link) { + link =ERR_PTR (-ENOMEM ); + }else if (befs_read_lsymlink (sb, data, link, len) != len) { +kfree (link); +befs_error (sb,"Failed to read entire long symlink" ); + link =ERR_PTR (-EIO ); + }else { + link[len -1 ] ='\0' ; + } } }else { link = befs_ino->i_data.symlink;
fs/fuse/dev.c +4 -0
@@ -899,6 +899,10 @@ static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size,if (outarg.namelen >FUSE_NAME_MAX ) goto err; + err = -EINVAL ; +if (size !=sizeof (outarg) + outarg.namelen +1 ) + goto err; + name.name = buf; name.len = outarg.namelen; err =fuse_copy_one (cs, buf, outarg.namelen +1 );
fs/partitions/efi.c +9 -0
@@ -311,6 +311,15 @@ is_gpt_valid(struct block_device *bdev, u64 lba, goto fail; } +/* Check the GUID Partition Table header size */ +if (le32_to_cpu ((*gpt)->header_size) > +bdev_logical_block_size (bdev)) { +pr_debug ("GUID Partition Table Header size is wrong: %u > %u\n" , +le32_to_cpu ((*gpt)->header_size), +bdev_logical_block_size (bdev)); + goto fail; + } +/* Check the GUID Partition Table CRC */ origcrc =le32_to_cpu ((*gpt)->header_crc32); (*gpt)->header_crc32 =0 ;
kernel/futex.c +42 -12
144 lines not on this page · raw message
mm/vmalloc.c +4 -3
@@ -671,9 +671,10 @@ static void free_unmap_vmap_area_addr(unsigned long addr)#define VMAP_BBMAP_BITS_MIN (VMAP_MAX_ALLOC*2)#define VMAP_MIN (x, y) ((x) < (y) ? (x) : (y))/* can't use min() */ #define VMAP_MAX (x, y) ((x) > (y) ? (x) : (y))/* can't use max() */ -#define VMAP_BBMAP_BITS VMAP_MIN(VMAP_BBMAP_BITS_MAX, \ - VMAP_MAX(VMAP_BBMAP_BITS_MIN, \ - VMALLOC_PAGES / NR_CPUS / 16)) +#define VMAP_BBMAP_BITS \ + VMAP_MIN(VMAP_BBMAP_BITS_MAX, \ + VMAP_MAX(VMAP_BBMAP_BITS_MIN, \ + VMALLOC_PAGES / roundup_pow_of_two(NR_CPUS) / 16))#define VMAP_BLOCK_SIZE (VMAP_BBMAP_BITS * PAGE_SIZE)
net/atm/br2684.c +0 -2
@@ -208,8 +208,6 @@ static int br2684_xmit_vcc(struct sk_buff *skb, struct net_device *dev,if (brdev->payload == p_bridged) {skb_push (skb,2 );memset (skb->data,0 ,2 ); - }else {/* p_routed */ -skb_pull (skb,ETH_HLEN ); } }skb_debug (skb);
sound/pci/ac97/ac97_patch.c +1 -0
@@ -1915,6 +1915,7 @@ static unsigned int ad1981_jacks_whitelist[] = {0x103c0944 ,/* HP nc6220 */ 0x103c0934 ,/* HP nc8220 */ 0x103c006d ,/* HP nx9105 */ +0x103c300d ,/* HP Compaq dc5100 SFF(PT003AW) */ 0x17340088 ,/* FSC Scenic-W */ 0 /* end */ };
sound/usb/caiaq/audio.c +31 -6
@@ -138,8 +138,12 @@ static void stream_stop(struct snd_usb_caiaqdev *dev)for (i =0 ; i <N_URBS ; i++) {usb_kill_urb (dev->data_urbs_in[i]); -usb_kill_urb (dev->data_urbs_out[i]); + +if (test_bit (i, &dev->outurb_active_mask)) +usb_kill_urb (dev->data_urbs_out[i]); } + + dev->outurb_active_mask =0 ; }static int snd_usb_caiaq_substream_open (struct snd_pcm_substream *substream)
@@ -466,8 +470,9 @@ static void read_completed(struct urb *urb) {struct snd_usb_caiaq_cb_info *info = urb->context;struct snd_usb_caiaqdev *dev; -struct urb *out; -int frame, len, send_it =0 , outframe =0 ; +struct urb *out =NULL ; +int i, frame, len, send_it =0 , outframe =0 ; +size_t offset =0 ;if (urb->status || !info)return ;
@@ -477,7 +482,17 @@ static void read_completed(struct urb *urb)if (!dev->streaming)return ; - out = dev->data_urbs_out[info->index]; +/* find an unused output urb that is unused */ +for (i =0 ; i <N_URBS ; i++) +if (test_and_set_bit (i, &dev->outurb_active_mask) ==0 ) { + out = dev->data_urbs_out[i]; +break ; + } + +if (!out) { +log ("Unable to find an output urb to use\n" ); + goto requeue; + }/* read the recently received packet and send back one which has * the same layout */
@@ -488,7 +503,8 @@ static void read_completed(struct urb *urb) len = urb->iso_frame_desc[outframe].actual_length; out->iso_frame_desc[outframe].length = len; out->iso_frame_desc[outframe].actual_length =0 ; - out->iso_frame_desc[outframe].offset =BYTES_PER_FRAME * frame; + out->iso_frame_desc[outframe].offset = offset; + offset += len;if (len >0 ) {spin_lock (&dev->spinlock);
@@ -504,11 +520,15 @@ static void read_completed(struct urb *urb) }if (send_it) { - out->number_of_packets =FRAMES_PER_URB ; + out->number_of_packets = outframe; out->transfer_flags =URB_ISO_ASAP ;usb_submit_urb (out,GFP_ATOMIC ); + }else { +struct snd_usb_caiaq_cb_info *oinfo = out->context; +clear_bit (oinfo->index, &dev->outurb_active_mask); } +requeue:/* re-submit inbound urb */ for (frame =0 ; frame <FRAMES_PER_URB ; frame++) { urb->iso_frame_desc[frame].offset =BYTES_PER_FRAME * frame;
@@ -530,6 +550,8 @@ static void write_completed(struct urb *urb) dev->output_running =1 ;wake_up (&dev->prepare_wait_queue); } + +clear_bit (info->index, &dev->outurb_active_mask); }static struct urb **alloc_urbs (struct snd_usb_caiaqdev *dev,int dir,int *ret)
@@ -680,6 +702,9 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)if (!dev->data_cb_info)return -ENOMEM ; + dev->outurb_active_mask =0 ; +BUILD_BUG_ON (N_URBS > (sizeof (dev->outurb_active_mask) *8 )); +for (i =0 ; i <N_URBS ; i++) { dev->data_cb_info[i].dev = dev; dev->data_cb_info[i].index = i;
sound/usb/caiaq/device.h +1 -0
@@ -92,6 +92,7 @@ struct snd_usb_caiaqdev {int input_panic, output_panic, warned;char *audio_in_buf, *audio_out_buf;unsigned int samplerates, bpp; +unsigned long outurb_active_mask;struct snd_pcm_substream *sub_playback[MAX_STREAMS ];struct snd_pcm_substream *sub_capture[MAX_STREAMS ];
tools/perf/util/config.c +0 -7
@@ -416,7 +416,6 @@ int perf_config_global(void)int perf_config (config_fn_t fn,void *data) {int ret =0 , found =0 ; -char *repo_config =NULL ;const char *home =NULL ;/* Setting $PERF_CONFIG makes perf read _only_ the given config file. */
@@ -438,12 +437,6 @@ int perf_config(config_fn_t fn, void *data)free (user_config); } - repo_config =perf_pathdup ("config" ); -if (!access (repo_config,R_OK )) { - ret +=perf_config_from_file (fn, repo_config, data); - found +=1 ; - } -free (repo_config);if (found ==0 )return -1 ;return ret;