Linux 2.6.27.48
Subsystems (19)
I'm announcing the release of the 2.6.27.48 kernel. All users of the 2.6.27 kernel series are very strongly encouraged to upgrade.
The updated 2.6.27.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.27.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.27.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/parisc/math-emu/decode_exc.c | 1 arch/powerpc/lib/string.S | 4 arch/powerpc/oprofile/op_model_cell.c | 2 arch/powerpc/platforms/pseries/hotplug-cpu.c | 30 --- arch/powerpc/platforms/pseries/plpar_wrappers.h | 8 arch/powerpc/platforms/pseries/smp.c | 28 ++ drivers/ata/libata-core.c | 7 drivers/char/ipmi/ipmi_si_intf.c | 11 - drivers/md/md.c | 29 ++ drivers/md/raid1.c | 9 drivers/md/raid10.c | 2 drivers/net/arcnet/com20020-pci.c | 4 fs/ext4/inode.c | 240 +++++++++++++++++++----- fs/ext4/resize.c | 3 fs/namespace.c | 9 fs/nfsd/nfssvc.c | 2 include/linux/fs.h | 2 include/net/sctp/structs.h | 1 mm/filemap.c | 6 net/sctp/sm_make_chunk.c | 62 +++++- net/tipc/bearer.c | 37 --- net/tipc/bearer.h | 2 net/tipc/net.c | 25 -- scripts/kconfig/Makefile | 2 security/keys/keyring.c | 18 - security/keys/process_keys.c | 6 27 files changed, 393 insertions(+), 159 deletions(-)
Andreas Bombe (1):
ARCNET: Limit com20020 PCI ID matches for SOHARD cards
Aneesh Kumar K.V (2):
ext4: Fix file fragmentation during large file write.
ext4: Implement range_cyclic in ext4_da_writepages instead of write_cache_pages
Dan Carpenter (1):
KEYS: Return more accurate error codes
Dan Williams (1):
md: set mddev readonly flag on blkdev BLKROSET ioctl
Denis Kirjanov (1):
powerpc/oprofile: fix potential buffer overrun in op_model_cell.c
Eric Sandeen (1):
ext4: check s_log_groups_per_flex in online resize code
Greg Kroah-Hartman (1):
Linux 2.6.27.48
Helge Deller (1):
parisc: clear floating point exception flag on SIGFPE signal
Jeff Mahoney (1):
powerpc: Fix handling of strncmp with zero len
Jeff Moyer (1):
do_generic_file_read: clear page errors when issuing a fresh read of the page
Jiri Kosina (1):
ipmi: handle run_to_completion properly in deliver_recv_msg()
Michael Neuling (2):
powerpc/pseries: Only call start-cpu when a CPU is stopped powerpc/pseries: Make query_cpu_stopped callable outside hotplug cpu
Miklos Szeredi (1):
vfs: add NOFOLLOW flag to umount(2)
Neil Horman (2):
sctp: Fix skb_over_panic resulting from multiple invalid parameter errors (CVE-2010-1173) (v4)
tipc: Fix oops on send prior to entering networked mode (v3)
NeilBrown (2):
md/raid1: fix counting of write targets.
md: Fix read balancing in RAID1 and RAID10 on drives > 2TB
Pavel Emelyanov (1):
NFSD: don't report compiled-out versions as present
Richard Kennedy (1):
gconfig: fix build failure on fedora 13
Tejun Heo (1):
libata: disable ATAPI AN by default
Theodore Ts'o (1):
ext4: Use our own write_cache_pages()
Toshiyuki Okajima (1):
KEYS: find_keyring_by_name() can gain access to a freed keyring
Wei Yongjun (1):
sctp: fix append error cause to ERROR chunk correctly
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 27 -EXTRAVERSION = .47 +EXTRAVERSION = .48 NAME = Trembling Tortoise # *DOCUMENTATION*
arch/parisc/math-emu/decode_exc.c +1 -0
@@ -342,6 +342,7 @@ decode_fpu(unsigned int Fpu_register[], unsigned int trap_counts[])return SIGNALCODE (SIGFPE ,FPE_FLTINV );case DIVISIONBYZEROEXCEPTION :update_trap_counts (Fpu_register, aflags, bflags, trap_counts); +Clear_excp_register (exception_index);return SIGNALCODE (SIGFPE ,FPE_FLTDIV );case INEXACTEXCEPTION :update_trap_counts (Fpu_register, aflags, bflags, trap_counts);
arch/powerpc/lib/string.S +3 -1
@@ -71,7 +71,7 @@ _GLOBAL(strcmp) _GLOBAL(strncmp) PPC_LCMPI r5,0 - beqlr + ble- 2f mtctr r5 addi r5,r3,-1 addi r4,r4,-1
@@ -82,6 +82,8 @@ _GLOBAL(strncmp) beqlr 1 bdnzt eq,1b blr +2: li r3,0 + blr _GLOBAL(strlen) addi r4,r3,-1
arch/powerpc/oprofile/op_model_cell.c +1 -1
@@ -821,7 +821,7 @@ static int calculate_lfsr(int n) index =ENTRIES -1 ;/* make sure index is valid */ -if ((index >ENTRIES ) || (index <0 )) +if ((index >=ENTRIES ) || (index <0 )) index =ENTRIES -1 ;return initial_lfsr[index];
arch/powerpc/platforms/pseries/hotplug-cpu.c +4 -26
@@ -66,30 +66,6 @@ static void pseries_mach_cpu_die(void)for (;;); } -static int qcss_tok;/* query-cpu-stopped-state token */ - -/* Get state of physical CPU. -* Return codes: -* 0 - The processor is in the RTAS stopped state -* 1 - stop-self is in progress -* 2 - The processor is not in the RTAS stopped state -* -1 - Hardware Error -* -2 - Hardware Busy, Try again later. -*/ -static int query_cpu_stopped (unsigned int pcpu) -{ -int cpu_status, status; - - status =rtas_call (qcss_tok,1 ,2 , &cpu_status, pcpu); -if (status !=0 ) { -printk (KERN_ERR -"RTAS query-cpu-stopped-state failed: %i\n" , status); -return status; - } - -return cpu_status; -} -static int pseries_cpu_disable (void ) {int cpu =smp_processor_id ();
@@ -113,8 +89,9 @@ static void pseries_cpu_die(unsigned int cpu)unsigned int pcpu =get_hard_smp_processor_id (cpu);for (tries =0 ; tries <25 ; tries++) { - cpu_status =query_cpu_stopped (pcpu); -if (cpu_status ==0 || cpu_status ==-1 ) + cpu_status =smp_query_cpu_stopped (pcpu); +if (cpu_status ==QCSS_STOPPED || + cpu_status ==QCSS_HARDWARE_ERROR )break ;msleep (200 ); }
@@ -256,6 +233,7 @@ static int __init pseries_cpu_hotplug_init(void) {struct device_node *np;const char *typep; +int qcss_tok;for_each_node_by_name (np,"interrupt-controller" ) { typep =of_get_property (np,"compatible" ,NULL );
arch/powerpc/platforms/pseries/plpar_wrappers.h +8 -0
@@ -4,6 +4,14 @@#include <asm/hvcall.h> #include <asm/page.h> +/* Get state of physical CPU from query_cpu_stopped */ +int smp_query_cpu_stopped (unsigned int pcpu); +#define QCSS_STOPPED 0 +#define QCSS_STOPPING 1 +#define QCSS_NOT_STOPPED 2 +#define QCSS_HARDWARE_ERROR -1 +#define QCSS_HARDWARE_BUSY -2 +static inline long poll_pending (void ) {return plpar_hcall_norets (H_POLL_PENDING );
arch/powerpc/platforms/pseries/smp.c +28 -0
@@ -59,6 +59,28 @@ static cpumask_t of_spin_map;extern void generic_secondary_smp_init (unsigned long ); +/* Query where a cpu is now. Return codes #defined in plpar_wrappers.h */ +int smp_query_cpu_stopped (unsigned int pcpu) +{ +int cpu_status, status; +int qcss_tok =rtas_token ("query-cpu-stopped-state" ); + +if (qcss_tok ==RTAS_UNKNOWN_SERVICE ) { +printk (KERN_INFO "Firmware doesn't support " +"query-cpu-stopped-state\n" ); +return QCSS_HARDWARE_ERROR ; + } + + status =rtas_call (qcss_tok,1 ,2 , &cpu_status, pcpu); +if (status !=0 ) { +printk (KERN_ERR +"RTAS query-cpu-stopped-state failed: %i\n" , status); +return status; + } + +return cpu_status; +} +/** * smp_startup_cpu() - start the given cpu *
@@ -84,6 +106,12 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu) pcpu =get_hard_smp_processor_id (lcpu); +/* Check to see if the CPU out of FW already for kexec */ +if (smp_query_cpu_stopped (pcpu) ==QCSS_NOT_STOPPED ){ +cpu_set (lcpu, of_spin_map); +return 1 ; + } +/* Fixup atomic count: it exited inside IRQ handler. */ task_thread_info (paca[lcpu].__current)->preempt_count =0 ;
drivers/ata/libata-core.c +6 -1
@@ -157,6 +157,10 @@ int libata_allow_tpm = 0;module_param_named (allow_tpm, libata_allow_tpm, int,0444 );MODULE_PARM_DESC (allow_tpm,"Permit the use of TPM commands" ); +static int atapi_an; +module_param (atapi_an, int,0444 ); +MODULE_PARM_DESC (atapi_an,"Enable ATAPI AN media presence notification (0=0ff [default], 1=on)" ); +MODULE_AUTHOR ("Jeff Garzik" );MODULE_DESCRIPTION ("Library module for ATA devices" );MODULE_LICENSE ("GPL" );
@@ -2341,7 +2345,8 @@ int ata_dev_configure(struct ata_device *dev)* to enable ATAPI AN to discern between PHY status * changed notifications and ATAPI ANs. */ -if ((ap->flags &ATA_FLAG_AN ) &&ata_id_has_atapi_AN (id) && +if (atapi_an && + (ap->flags &ATA_FLAG_AN ) &&ata_id_has_atapi_AN (id) && (!sata_pmp_attached (ap) ||sata_scr_read (&ap->link,SCR_NOTIFICATION , &sntf) ==0 )) {unsigned int err_mask;
drivers/char/ipmi/ipmi_si_intf.c +8 -3
@@ -313,9 +313,14 @@ static void deliver_recv_msg(struct smi_info *smi_info, {/* Deliver the message to the upper layer with the lock released. */ -spin_unlock (&(smi_info->si_lock)); -ipmi_smi_msg_received (smi_info->intf, msg); -spin_lock (&(smi_info->si_lock)); + +if (smi_info->run_to_completion) { +ipmi_smi_msg_received (smi_info->intf, msg); + }else { +spin_unlock (&(smi_info->si_lock)); +ipmi_smi_msg_received (smi_info->intf, msg); +spin_lock (&(smi_info->si_lock)); + } }static void return_hosed_msg (struct smi_info *smi_info,int cCode)
drivers/md/md.c +29 -0
@@ -4816,6 +4816,7 @@ static int md_ioctl(struct inode *inode, struct file *file,int err =0 ;void __user *argp = (void __user *)arg;mddev_t *mddev =NULL ; +int ro;if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
@@ -4951,6 +4952,34 @@ static int md_ioctl(struct inode *inode, struct file *file, err =do_md_stop (mddev,1 ,1 ); goto done_unlock; +case BLKROSET : +if (get_user (ro, (int __user *)(arg))) { + err = -EFAULT ; + goto done_unlock; + } + err = -EINVAL ; + +/* if the bdev is going readonly the value of mddev->ro +* does not matter, no writes are coming +*/ +if (ro) + goto done_unlock; + +/* are we are already prepared for writes? */ +if (mddev->ro !=1 ) + goto done_unlock; + +/* transitioning to readauto need only happen for +* arrays that call md_write_start +*/ +if (mddev->pers) { + err =restart_array (mddev); +if (err ==0 ) { + mddev->ro =2 ; +set_disk_ro (mddev->gendisk,0 ); + } + } + goto done_unlock; }/*
drivers/md/raid1.c +5 -4
@@ -413,7 +413,7 @@ static void raid1_end_write_request(struct bio *bio, int error)*/ static int read_balance (conf_t *conf,r1bio_t *r1_bio) { -const unsigned long this_sector = r1_bio->sector; +const sector_t this_sector = r1_bio->sector;int new_disk = conf->last_used, disk = new_disk;int wonly_disk =-1 ;const int sectors = r1_bio->sectors;
@@ -429,7 +429,7 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio) retry:if (conf->mddev->recovery_cp < MaxSector && (this_sector + sectors >= conf->next_resync)) { -/* Choose the first operation device, for consistancy */ +/* Choose the first operational device, for consistancy */ new_disk =0 ; for (rdev = rcu_dereference(conf->mirrors[new_disk].rdev);
@@ -879,9 +879,10 @@ static int make_request(struct request_queue *q, struct bio * bio)if (test_bit (Faulty, &rdev->flags)) {rdev_dec_pending (rdev, mddev); r1_bio->bios[i] =NULL ; - }else + }else { r1_bio->bios[i] = bio; - targets++; + targets++; + } }else r1_bio->bios[i] =NULL ; }
drivers/md/raid10.c +1 -1
@@ -490,7 +490,7 @@ static int raid10_mergeable_bvec(struct request_queue *q,*/ static int read_balance (conf_t *conf,r10bio_t *r10_bio) { -const unsigned long this_sector = r10_bio->sector; +const sector_t this_sector = r10_bio->sector;int disk, slot, nslot;const int sectors = r10_bio->sectors;sector_t new_distance, current_distance;
drivers/net/arcnet/com20020-pci.c +2 -2
@@ -162,8 +162,8 @@ static struct pci_device_id com20020pci_id_table[] = { { 0x1571, 0xa204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, { 0x1571, 0xa205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, { 0x1571, 0xa206, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, - { 0x10B5, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, - { 0x10B5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, + { 0x10B5, 0x9030, 0x10B5, 0x2978, 0, 0, ARC_CAN_10MBIT }, + { 0x10B5, 0x9050, 0x10B5, 0x2273, 0, 0, ARC_CAN_10MBIT }, { 0x14BA, 0x6000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, { 0x10B5, 0x2200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT }, {0,}
fs/ext4/inode.c +195 -45
324 lines not on this page · raw message
fs/ext4/resize.c +2 -1
@@ -935,7 +935,8 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input)percpu_counter_add (&sbi->s_freeinodes_counter,EXT4_INODES_PER_GROUP (sb)); -if (EXT4_HAS_INCOMPAT_FEATURE (sb,EXT4_FEATURE_INCOMPAT_FLEX_BG )) { +if (EXT4_HAS_INCOMPAT_FEATURE (sb,EXT4_FEATURE_INCOMPAT_FLEX_BG ) && + sbi->s_log_groups_per_flex) {ext4_group_t flex_group; flex_group =ext4_flex_group (sbi, input->group); sbi->s_flex_groups[flex_group].free_blocks +=
fs/namespace.c +8 -1
@@ -1132,8 +1132,15 @@ SYSCALL_DEFINE2(umount, char __user *, name, int, flags) {struct path path;int retval; +int lookup_flags =0 ; - retval =user_path (name, &path); +if (flags & ~(MNT_FORCE |MNT_DETACH |MNT_EXPIRE |UMOUNT_NOFOLLOW )) +return -EINVAL ; + +if (!(flags &UMOUNT_NOFOLLOW )) + lookup_flags |=LOOKUP_FOLLOW ; + + retval =user_path_at (AT_FDCWD , name, lookup_flags, &path);if (retval) goto out; retval = -EINVAL ;
fs/nfsd/nfssvc.c +1 -1
@@ -126,7 +126,7 @@ struct svc_program nfsd_program = {int nfsd_vers (int vers,enum vers_op change) {if (vers <NFSD_MINVERS || vers >=NFSD_NRVERS ) -return -1 ; +return 0 ;switch (change) {case NFSD_SET : nfsd_versions[vers] = nfsd_version[vers];
include/linux/fs.h +2 -0
@@ -1061,6 +1061,8 @@ extern int send_sigurg(struct fown_struct *fown);#define MNT_FORCE 0x00000001/* Attempt to forcibily umount */ #define MNT_DETACH 0x00000002/* Just detach from the tree */ #define MNT_EXPIRE 0x00000004/* Mark for expiry */ +#define UMOUNT_NOFOLLOW 0x00000008/* Don't follow symlink on umount */ +#define UMOUNT_UNUSED 0x80000000/* Flag guaranteed to be unused */ extern struct list_head super_blocks;extern spinlock_t sb_lock;
include/net/sctp/structs.h +1 -0
@@ -753,6 +753,7 @@ int sctp_user_addto_chunk(struct sctp_chunk *chunk, int off, int len, struct iovec *data);void sctp_chunk_free (struct sctp_chunk *);void *sctp_addto_chunk (struct sctp_chunk *,int len,const void *data); +void *sctp_addto_chunk_fixed (struct sctp_chunk *,int len,const void *data);struct sctp_chunk *sctp_chunkify (struct sk_buff *,const struct sctp_association *,struct sock *);
mm/filemap.c +6 -0
@@ -1118,6 +1118,12 @@ page_not_up_to_date_locked: } readpage: +/* +* A previous I/O error may have been due to temporary +* failures, eg. multipath errors. +* PG_error will be set again if readpage fails. +*/ +ClearPageError (page);/* Start the actual read. The read will unlock the page. */ error = mapping->a_ops->readpage (filp, page);
net/sctp/sm_make_chunk.c +57 -5
95 lines not on this page · raw message
net/tipc/bearer.c +6 -31
@@ -45,10 +45,10 @@#define MAX_ADDR_STR 32 -static struct media *media_list =NULL ; +static struct media media_list[MAX_MEDIA ];static u32 media_count =0 ; -struct bearer *tipc_bearers =NULL ; +struct bearer tipc_bearers[MAX_BEARERS ];/** * media_name_valid - validate media name
@@ -108,9 +108,11 @@ int tipc_register_media(u32 media_type,int res = -EINVAL ;write_lock_bh (&tipc_net_lock); -if (!media_list) - goto exit; +if (tipc_mode !=TIPC_NET_MODE ) { +warn ("Media <%s> rejected, not in networked mode yet\n" , name); + goto exit; + }if (!media_name_valid (name)) {warn ("Media <%s> rejected, illegal name\n" , name); goto exit;
@@ -660,33 +662,10 @@ int tipc_disable_bearer(const char *name) -int tipc_bearer_init (void ) -{ -int res; - -write_lock_bh (&tipc_net_lock); - tipc_bearers =kcalloc (MAX_BEARERS ,sizeof (struct bearer ),GFP_ATOMIC ); - media_list =kcalloc (MAX_MEDIA ,sizeof (struct media ),GFP_ATOMIC ); -if (tipc_bearers && media_list) { - res =0 ; - }else { -kfree (tipc_bearers); -kfree (media_list); - tipc_bearers =NULL ; - media_list =NULL ; - res = -ENOMEM ; - } -write_unlock_bh (&tipc_net_lock); -return res; -} -void tipc_bearer_stop (void ) {u32 i; -if (!tipc_bearers) -return ; -for (i =0 ; i <MAX_BEARERS ; i++) {if (tipc_bearers[i].active) tipc_bearers[i].publ.blocked =1 ;
@@ -695,10 +674,6 @@ void tipc_bearer_stop(void)if (tipc_bearers[i].active)bearer_disable (tipc_bearers[i].publ.name); } -kfree (tipc_bearers); -kfree (media_list); - tipc_bearers =NULL ; - media_list =NULL ; media_count =0 ; }
net/tipc/bearer.h +1 -1
@@ -114,7 +114,7 @@ struct bearer_name {struct link ; -extern struct bearer *tipc_bearers; +extern struct bearer tipc_bearers[];void tipc_media_addr_printf (struct print_buf *pb,struct tipc_media_addr *a);struct sk_buff *tipc_media_get_names (void );
net/tipc/net.c +4 -21
@@ -116,7 +116,8 @@*/ DEFINE_RWLOCK (tipc_net_lock); -struct network tipc_net = {NULL }; +struct _zone *tipc_zones[256 ] = {NULL , }; +struct network tipc_net = { tipc_zones };struct tipc_node *tipc_net_select_remote_node (u32 addr,u32 ref) {
@@ -158,28 +159,12 @@ void tipc_net_send_external_routes(u32 dest) } } -static int net_init (void ) -{ -memset (&tipc_net,0 ,sizeof (tipc_net)); - tipc_net.zones =kcalloc (tipc_max_zones +1 ,sizeof (struct _zone *),GFP_ATOMIC ); -if (!tipc_net.zones) { -return -ENOMEM ; - } -return 0 ; -} -static void net_stop (void ) {u32 z_num; -if (!tipc_net.zones) -return ; - -for (z_num =1 ; z_num <= tipc_max_zones; z_num++) { +for (z_num =1 ; z_num <= tipc_max_zones; z_num++)tipc_zone_delete (tipc_net.zones[z_num]); - } -kfree (tipc_net.zones); - tipc_net.zones =NULL ; }static void net_route_named_msg (struct sk_buff *buf)
@@ -282,9 +267,7 @@ int tipc_net_start(u32 addr)tipc_named_reinit ();tipc_port_reinit (); -if ((res =tipc_bearer_init ()) || - (res =net_init ()) || - (res =tipc_cltr_init ()) || +if ((res =tipc_cltr_init ()) || (res =tipc_bclink_init ())) {return res; }
scripts/kconfig/Makefile +1 -1
@@ -161,7 +161,7 @@ HOSTCFLAGS_zconf.tab.o := -I$(src) HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK -HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` +HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ -D LKC_DIRECT_LINK
security/keys/keyring.c +9 -9
@@ -523,9 +523,8 @@ struct key *find_keyring_by_name(const char *name, bool skip_perm_check)struct key *keyring;int bucket; - keyring =ERR_PTR (-EINVAL );if (!name) - goto error; +return ERR_PTR (-EINVAL ); bucket =keyring_hash (name);
@@ -549,17 +548,18 @@ struct key *find_keyring_by_name(const char *name, bool skip_perm_check) KEY_SEARCH) < 0)continue ; -/* we've got a match */ -atomic_inc (&keyring->usage); -read_unlock (&keyring_name_lock); - goto error; +/* we've got a match but we might end up racing with +* key_cleanup() if the keyring is currently 'dead' +* (ie. it has a zero usage count) */ +if (!atomic_inc_not_zero (&keyring->usage)) +continue ; + goto out; } } -read_unlock (&keyring_name_lock); keyring =ERR_PTR (-ENOKEY ); - - error: +out: +read_unlock (&keyring_name_lock);return keyring; }/* end find_keyring_by_name() */
security/keys/process_keys.c +3 -3
@@ -592,7 +592,7 @@ key_ref_t lookup_user_key(struct task_struct *context, key_serial_t id, ret =install_thread_keyring (context);if (ret <0 ) { - key =ERR_PTR (ret); + key_ref =ERR_PTR (ret); goto error; } }
@@ -609,7 +609,7 @@ key_ref_t lookup_user_key(struct task_struct *context, key_serial_t id, ret =install_process_keyring (context);if (ret <0 ) { - key =ERR_PTR (ret); + key_ref =ERR_PTR (ret); goto error; } }
@@ -665,7 +665,7 @@ key_ref_t lookup_user_key(struct task_struct *context, key_serial_t id,case KEY_SPEC_GROUP_KEYRING :/* group keyrings are not yet supported */ - key =ERR_PTR (-EINVAL ); + key_ref =ERR_PTR (-EINVAL ); goto error;case KEY_SPEC_REQKEY_AUTH_KEY :