Linux 3.14.65
Greg KH
maintainerI'm announcing the release of the 3.14.65 kernel.
All users of the 3.14 kernel series must upgrade.
The updated 3.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.14.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/filesystems/efivarfs.txt | 7 + Makefile | 2 arch/powerpc/kernel/module_64.c | 2 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 14 ++ arch/x86/kvm/vmx.c | 7 + arch/x86/kvm/x86.c | 9 - crypto/af_alg.c | 35 ----- drivers/firmware/efi/efivars.c | 34 ++--- drivers/firmware/efi/vars.c | 164 +++++++++++++++++-------- fs/efivarfs/file.c | 71 ++++++++++ fs/efivarfs/inode.c | 30 ++-- fs/efivarfs/internal.h | 3 fs/efivarfs/super.c | 16 +- include/crypto/if_alg.h | 8 - include/linux/efi.h | 9 + include/linux/module.h | 17 +- include/linux/tracepoint.h | 17 +- include/linux/ucs2_string.h | 4 kernel/module.c | 111 ++++++++++------ lib/ucs2_string.c | 62 +++++++++ net/mac80211/agg-rx.c | 2 net/mac80211/rc80211_minstrel_ht.c | 2 net/wireless/wext-core.c | 51 ++++++- sound/soc/codecs/wm8958-dsp2.c | 8 - sound/soc/codecs/wm8994.c | 4 tools/testing/selftests/efivarfs/efivarfs.sh | 19 ++ tools/testing/selftests/efivarfs/open-unlink.c | 72 ++++++++++ 27 files changed, 566 insertions(+), 214 deletions(-)
Andreas Schwab (1):
powerpc: Fix dedotify for binutils >= 2.26
Chris Bainbridge (1):
mac80211: fix use of uninitialised values in RX aggregation
Felix Fietkau (1):
mac80211: minstrel_ht: set default tx aggregation timeout to 0
Greg Kroah-Hartman (2):
Revert: "crypto: af_alg - Disallow bind/setkey/... after accept(2)" Linux 3.14.65
Jason Andryuk (1):
lib/ucs2_string: Correct ucs2 -> utf8 conversion
Johannes Berg (1):
wext: fix message delay/ordering
Marcelo Tosatti (1):
KVM: x86: move steal time initialization to vcpu entry time
Matt Fleming (1):
efi: Add pstore variables to the deletion whitelist
Paul Mackerras (1):
KVM: PPC: Book3S HV: Sanitize special-purpose register values on guest exit
Peter Jones (5):
lib/ucs2_string: Add ucs2 -> utf8 helper functions
efi: Use ucs2_as_utf8 in efivarfs instead of open coding a bad version
efi: Do variable name validation tests in utf8
efi: Make our variable validation list include the guid
efi: Make efivarfs entries immutable by default
Radim Krčmář (1):
KVM: VMX: disable PEBS before a guest entry
Rusty Russell (1):
modules: fix longstanding /proc/kallsyms vs module insertion race.
Steven Rostedt (Red Hat) (1):
tracing: Fix check for cpu online when event is disabled
Takashi Iwai (2):
ASoC: wm8994: Fix enum ctl accesses in a wrong type
ASoC: wm8958: Fix enum ctl accesses in a wrong type
Greg KH
maintainerDocumentation/filesystems/efivarfs.txt +7 -0
@@ -14,3 +14,10 @@ filesystem. efivarfs is typically mounted like this, mount -t efivarfs none /sys/firmware/efi/efivars + +Due to the presence of numerous firmware bugs where removing non-standard +UEFI variables causes the system firmware to fail to POST, efivarfs +files that are not well-known standardized variables are created +as immutable files. This doesn't prevent removal - "chattr -i" will work - +but it does prevent this kind of failure from being accomplished +accidentally.
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 64 +SUBLEVEL = 65 EXTRAVERSION = NAME = Remembering Coco
arch/powerpc/kernel/module_64.c +1 -1
@@ -202,7 +202,7 @@ static void dedotify(Elf64_Sym *syms, unsigned int numsyms, char *strtab)if (syms[i].st_shndx ==SHN_UNDEF ) {char *name = strtab + syms[i].st_name;if (name[0 ] =='.' ) -memmove (name, name+1 ,strlen (name)); + syms[i].st_name++; } } }
arch/powerpc/kvm/book3s_hv_rmhandlers.S +14 -0
@@ -1148,6 +1148,20 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S) std r6, VCPU_ACOP(r9) stw r7, VCPU_GUEST_PID(r9) std r8, VCPU_WORT(r9) + /* + * Restore various registers to 0, where non-zero values + * set by the guest could disrupt the host. + */ + li r0, 0 + mtspr SPRN_IAMR, r0 + mtspr SPRN_CIABR, r0 + mtspr SPRN_DAWRX, r0 + mtspr SPRN_TCSCR, r0 + mtspr SPRN_WORT, r0 + /* Set MMCRS to 1<<31 to freeze and disable the SPMC counters */ + li r0, 1 + sldi r0, r0, 31 + mtspr SPRN_MMCRS, r0 8: /* Save and reset AMR and UAMOR before turning on the MMU */
arch/x86/kvm/vmx.c +7 -0
@@ -1555,6 +1555,13 @@ static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr,return ; }break ; +case MSR_IA32_PEBS_ENABLE : +/* PEBS needs a quiescent period after being disabled (to write +* a record). Disabling PEBS through VMX MSR swapping doesn't +* provide that period, so a CPU could write host's record into +* guest's memory. +*/ +wrmsrl (MSR_IA32_PEBS_ENABLE ,0 ); }for (i =0 ; i < m->nr; ++i)
arch/x86/kvm/x86.c +2 -7
@@ -1991,6 +1991,8 @@ static void accumulate_steal_time(struct kvm_vcpu *vcpu)static void record_steal_time (struct kvm_vcpu *vcpu) { +accumulate_steal_time (vcpu); +if (!(vcpu->arch.st.msr_val &KVM_MSR_ENABLED ))return ;
@@ -2123,12 +2125,6 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)if (!(data &KVM_MSR_ENABLED ))break ; - vcpu->arch.st.last_steal = current->sched_info.run_delay; - -preempt_disable (); -accumulate_steal_time (vcpu); -preempt_enable (); -kvm_make_request (KVM_REQ_STEAL_UPDATE , vcpu);break ;
@@ -2818,7 +2814,6 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) vcpu->cpu = cpu; } -accumulate_steal_time (vcpu);kvm_make_request (KVM_REQ_STEAL_UPDATE , vcpu); }
crypto/af_alg.c +3 -32
@@ -125,23 +125,6 @@ int af_alg_release(struct socket *sock) }EXPORT_SYMBOL_GPL (af_alg_release); -void af_alg_release_parent (struct sock *sk) -{ -struct alg_sock *ask =alg_sk (sk); -bool last; - - sk = ask->parent; - ask =alg_sk (sk); - -lock_sock (sk); - last = !--ask->refcnt; -release_sock (sk); - -if (last) -sock_put (sk); -} -EXPORT_SYMBOL_GPL (af_alg_release_parent); -static int alg_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len) {struct sock *sk = sock->sk;
@@ -149,7 +132,6 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)struct sockaddr_alg *sa = (void *)uaddr;const struct af_alg_type *type;void *private; -int err;if (sock->state ==SS_CONNECTED )return -EINVAL ;
@@ -175,22 +157,16 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)return PTR_ERR (private); } - err = -EBUSY ;lock_sock (sk); -if (ask->refcnt) - goto unlock;swap (ask->type, type);swap (ask->private, private); - err =0 ; - -unlock:release_sock (sk);alg_do_release (type, private); -return err; +return 0 ; } static int alg_setkey(struct sock *sk, char __user *ukey,
@@ -223,15 +199,11 @@ static int alg_setsockopt(struct socket *sock, int level, int optname,struct sock *sk = sock->sk;struct alg_sock *ask =alg_sk (sk);const struct af_alg_type *type; -int err = -EBUSY ; +int err = -ENOPROTOOPT ;lock_sock (sk); -if (ask->refcnt) - goto unlock; - type = ask->type; - err = -ENOPROTOOPT ;if (level !=SOL_ALG || !type) goto unlock;
@@ -280,8 +252,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) sk2->sk_family =PF_ALG ; -if (!ask->refcnt++) -sock_hold (sk); +sock_hold (sk);alg_sk (sk2)->parent = sk;alg_sk (sk2)->type = type;
drivers/firmware/efi/efivars.c +14 -20
@@ -219,7 +219,8 @@ efivar_store_raw(struct efivar_entry *entry, const char *buf, size_t count) }if ((new_var->Attributes & ~EFI_VARIABLE_MASK ) !=0 || -efivar_validate (new_var, new_var->Data, new_var->DataSize) == false) { +efivar_validate (new_var->VendorGuid, new_var->VariableName, + new_var->Data, new_var->DataSize) == false) {printk (KERN_ERR "efivars: Malformed variable content\n" );return -EINVAL ; }
@@ -334,7 +335,8 @@ static ssize_t efivar_create(struct file *filp, struct kobject *kobj,return -EACCES ;if ((new_var->Attributes & ~EFI_VARIABLE_MASK ) !=0 || -efivar_validate (new_var, new_var->Data, new_var->DataSize) == false) { +efivar_validate (new_var->VendorGuid, new_var->VariableName, + new_var->Data, new_var->DataSize) == false) {printk (KERN_ERR "efivars: Malformed variable content\n" );return -EINVAL ; }
@@ -409,35 +411,27 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var) {int i, short_name_size;char *short_name; -unsigned long variable_name_size; -efi_char16_t *variable_name; - - variable_name = new_var->var.VariableName; - variable_name_size =ucs2_strlen (variable_name) *sizeof (efi_char16_t); +unsigned long utf8_name_size; +efi_char16_t *variable_name = new_var->var.VariableName;/* -* Length of the variable bytes in ASCII, plus the '-' separator, +* Length of the variable bytes in UTF8, plus the '-' separator, * plus the GUID, plus trailing NUL */ - short_name_size = variable_name_size /sizeof (efi_char16_t) - +1 +EFI_VARIABLE_GUID_LEN +1 ; - - short_name =kzalloc (short_name_size,GFP_KERNEL ); + utf8_name_size =ucs2_utf8size (variable_name); + short_name_size = utf8_name_size +1 +EFI_VARIABLE_GUID_LEN +1 ; + short_name =kmalloc (short_name_size,GFP_KERNEL );if (!short_name)return 1 ; -/* Convert Unicode to normal chars (assume top bits are 0), -ala UTF-8 */ -for (i=0 ; i < (int )(variable_name_size /sizeof (efi_char16_t)); i++) { - short_name[i] = variable_name[i] &0xFF ; - } +ucs2_as_utf8 (short_name, variable_name, short_name_size); +/* This is ugly, but necessary to separate one vendor's private variables from another's. */ - - *(short_name +strlen (short_name)) ='-' ; + short_name[utf8_name_size] ='-' ;efi_guid_unparse (&new_var->var.VendorGuid, - short_name +strlen (short_name)); + short_name + utf8_name_size +1 ); new_var->kobj.kset = efivars_kset;
drivers/firmware/efi/vars.c +115 -49
240 lines not on this page · raw message
fs/efivarfs/file.c +71 -0
86 lines not on this page · raw message
fs/efivarfs/inode.c +19 -11
@@ -15,7 +15,8 @@#include "internal.h" struct inode *efivarfs_get_inode (struct super_block *sb, -const struct inode *dir,int mode,dev_t dev) +const struct inode *dir,int mode, +dev_t dev,bool is_removable) {struct inode *inode =new_inode (sb);
@@ -23,6 +24,7 @@ struct inode *efivarfs_get_inode(struct super_block *sb, inode->i_ino =get_next_ino (); inode->i_mode = mode; inode->i_atime = inode->i_mtime = inode->i_ctime =CURRENT_TIME ; + inode->i_flags = is_removable ?0 :S_IMMUTABLE ;switch (mode &S_IFMT ) {case S_IFREG : inode->i_fop = &efivarfs_file_operations;
@@ -102,22 +104,17 @@ static void efivarfs_hex_to_guid(const char *str, efi_guid_t *guid)static int efivarfs_create (struct inode *dir,struct dentry *dentry,umode_t mode,bool excl) { -struct inode *inode; +struct inode *inode =NULL ;struct efivar_entry *var;int namelen, i =0 , err =0 ; +bool is_removable = false;if (!efivarfs_valid_name (dentry->d_name.name, dentry->d_name.len))return -EINVAL ; - inode =efivarfs_get_inode (dir->i_sb, dir, mode,0 ); -if (!inode) -return -ENOMEM ; - var =kzalloc (sizeof (struct efivar_entry ),GFP_KERNEL ); -if (!var) { - err = -ENOMEM ; - goto out; - } +if (!var) +return -ENOMEM ;/* length of the variable name itself: remove GUID and separator */ namelen = dentry->d_name.len -EFI_VARIABLE_GUID_LEN -1 ;
@@ -125,6 +122,16 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry,efivarfs_hex_to_guid (dentry->d_name.name + namelen +1 , &var->var.VendorGuid); +if (efivar_variable_is_removable (var->var.VendorGuid, + dentry->d_name.name, namelen)) + is_removable = true; + + inode =efivarfs_get_inode (dir->i_sb, dir, mode,0 , is_removable); +if (!inode) { + err = -ENOMEM ; + goto out; + } +for (i =0 ; i < namelen; i++) var->var.VariableName[i] = dentry->d_name.name[i];
@@ -138,7 +145,8 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry, out:if (err) {kfree (var); -iput (inode); +if (inode) +iput (inode); }return err; }
fs/efivarfs/internal.h +2 -1
@@ -15,7 +15,8 @@ extern const struct file_operations efivarfs_file_operations;extern const struct inode_operations efivarfs_dir_inode_operations;extern bool efivarfs_valid_name (const char *str,int len);extern struct inode *efivarfs_get_inode (struct super_block *sb, -const struct inode *dir,int mode,dev_t dev); +const struct inode *dir,int mode,dev_t dev, +bool is_removable);extern struct list_head efivarfs_list;
fs/efivarfs/super.c +10 -6
@@ -118,8 +118,9 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,struct dentry *dentry, *root = sb->s_root;unsigned long size =0 ;char *name; -int len, i; +int len;int err = -ENOMEM ; +bool is_removable = false; entry =kmalloc (sizeof (*entry),GFP_KERNEL );if (!entry)
@@ -128,15 +129,17 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,memcpy (entry->var.VariableName, name16, name_size);memcpy (&(entry->var.VendorGuid), &vendor,sizeof (efi_guid_t)); - len =ucs2_strlen (entry->var.VariableName); + len =ucs2_utf8size (entry->var.VariableName);/* name, plus '-', plus GUID, plus NUL*/ name =kmalloc (len +1 +EFI_VARIABLE_GUID_LEN +1 ,GFP_KERNEL );if (!name) goto fail; -for (i =0 ; i < len; i++) - name[i] = entry->var.VariableName[i] &0xFF ; +ucs2_as_utf8 (name, entry->var.VariableName, len); + +if (efivar_variable_is_removable (entry->var.VendorGuid, name, len)) + is_removable = true; name[len] ='-' ;
@@ -144,7 +147,8 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor, name[len +EFI_VARIABLE_GUID_LEN +1 ] ='\0' ; - inode =efivarfs_get_inode (sb, root->d_inode,S_IFREG |0644 ,0 ); + inode =efivarfs_get_inode (sb, root->d_inode,S_IFREG |0644 ,0 , + is_removable);if (!inode) goto fail_name;
@@ -200,7 +204,7 @@ static int efivarfs_fill_super(struct super_block *sb, void *data, int silent) sb->s_d_op = &efivarfs_d_ops; sb->s_time_gran =1 ; - inode =efivarfs_get_inode (sb,NULL ,S_IFDIR |0755 ,0 ); + inode =efivarfs_get_inode (sb,NULL ,S_IFDIR |0755 ,0 , true);if (!inode)return -ENOMEM ; inode->i_op = &efivarfs_dir_inode_operations;
include/crypto/if_alg.h +5 -3
@@ -30,8 +30,6 @@ struct alg_sock {struct sock *parent; -unsigned int refcnt; -const struct af_alg_type *type;void *private; };
@@ -66,7 +64,6 @@ int af_alg_register_type(const struct af_alg_type *type);int af_alg_unregister_type (const struct af_alg_type *type);int af_alg_release (struct socket *sock); -void af_alg_release_parent (struct sock *sk);int af_alg_accept (struct sock *sk,struct socket *newsock); int af_alg_make_sg(struct af_alg_sgl *sgl, void __user *addr, int len,
@@ -83,6 +80,11 @@ static inline struct alg_sock *alg_sk(struct sock *sk)return (struct alg_sock *)sk; } +static inline void af_alg_release_parent (struct sock *sk) +{ +sock_put (alg_sk (sk)->parent); +} +static inline void af_alg_init_completion (struct af_alg_completion *completion) {init_completion (&completion->completion);
include/linux/efi.h +7 -2
@@ -792,8 +792,10 @@ struct efivars {* and we use a page for reading/writing. */ +#define EFI_VAR_NAME_LEN 1024 +struct efi_variable { -efi_char16_t VariableName[1024 /sizeof (efi_char16_t)]; +efi_char16_t VariableName[EFI_VAR_NAME_LEN /sizeof (efi_char16_t)];efi_guid_t VendorGuid;unsigned long DataSize;__u8 Data[1024 ];
@@ -864,7 +866,10 @@ int efivar_entry_iter(int (*func)(struct efivar_entry *, void *),struct efivar_entry *efivar_entry_find (efi_char16_t *name,efi_guid_t guid,struct list_head *head,bool remove); -bool efivar_validate (struct efi_variable *var,u8 *data,unsigned long len); +bool efivar_validate (efi_guid_t vendor,efi_char16_t *var_name,u8 *data, +unsigned long data_size); +bool efivar_variable_is_removable (efi_guid_t vendor,const char *name, +size_t len);extern struct work_struct efivar_work;void efivar_run_worker (void );
include/linux/module.h +9 -8
@@ -227,6 +227,12 @@ struct module_ref {unsigned long decs; } __attribute((aligned(2 * sizeof(unsigned long)))); +struct mod_kallsyms { +Elf_Sym *symtab; +unsigned int num_symtab; +char *strtab; +}; +struct module {enum module_state state;
@@ -314,14 +320,9 @@ struct module {#endif #ifdef CONFIG_KALLSYMS -/* -* We keep the symbol and string tables for kallsyms. -* The core_* fields below are temporary, loader-only (they -* could really be discarded after module init). -*/ -Elf_Sym *symtab, *core_symtab; -unsigned int num_symtab, core_num_syms; -char *strtab, *core_strtab; +/* Protected by RCU and/or module_mutex: use rcu_dereference() */ +struct mod_kallsyms *kallsyms; +struct mod_kallsyms core_kallsyms;/* Section attributes */ struct module_sect_attrs *sect_attrs;
include/linux/tracepoint.h +9 -8
@@ -129,9 +129,6 @@ static inline void tracepoint_synchronize_unregister(void)void *it_func; \void *__data; \ \ -if (!cpu_online (raw_smp_processor_id ())) \ -return ; \ - \if (!(cond)) \return ; \ prercu; \
@@ -265,15 +262,19 @@ static inline void tracepoint_synchronize_unregister(void)* "void *__data, proto" as the callback prototype. */ #define DECLARE_TRACE_NOARGS (name) \ - __DECLARE_TRACE(name, void, , 1, void *__data, __data) + __DECLARE_TRACE(name, void, , \ + cpu_online(raw_smp_processor_id()), \ + void *__data, __data)#define DECLARE_TRACE (name, proto, args) \ - __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), 1, \ - PARAMS(void *__data, proto), \ - PARAMS(__data, args)) + __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ + cpu_online(raw_smp_processor_id()), \ + PARAMS(void *__data, proto), \ + PARAMS(__data, args))#define DECLARE_TRACE_CONDITION (name, proto, args, cond) \ - __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), PARAMS(cond), \ + __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ + cpu_online(raw_smp_processor_id()) && (PARAMS(cond)), \ PARAMS(void *__data, proto), \ PARAMS(__data, args))
include/linux/ucs2_string.h +4 -0
@@ -11,4 +11,8 @@ unsigned long ucs2_strlen(const ucs2_char_t *s);unsigned long ucs2_strsize (const ucs2_char_t *data,unsigned long maxlength);int ucs2_strncmp (const ucs2_char_t *a,const ucs2_char_t *b,size_t len); +unsigned long ucs2_utf8size (const ucs2_char_t *src); +unsigned long ucs2_as_utf8 (u8 *dest,const ucs2_char_t *src, +unsigned long maxlength); +#endif /* _LINUX_UCS2_STRING_H_ */
kernel/module.c +69 -42
207 lines not on this page · raw message
lib/ucs2_string.c +62 -0
65 lines not on this page · raw message
net/mac80211/agg-rx.c +1 -1
@@ -290,7 +290,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, }/* prepare A-MPDU MLME for Rx aggregation */ - tid_agg_rx =kmalloc (sizeof (struct tid_ampdu_rx ),GFP_KERNEL ); + tid_agg_rx =kzalloc (sizeof (*tid_agg_rx),GFP_KERNEL );if (!tid_agg_rx) goto end;
net/mac80211/rc80211_minstrel_ht.c +1 -1
@@ -463,7 +463,7 @@ minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb)if (skb_get_queue_mapping (skb) ==IEEE80211_AC_VO )return ; -ieee80211_start_tx_ba_session (pubsta, tid,5000 ); +ieee80211_start_tx_ba_session (pubsta, tid,0 ); } static void
net/wireless/wext-core.c +40 -11
70 lines not on this page · raw message
sound/soc/codecs/wm8958-dsp2.c +4 -4
@@ -459,7 +459,7 @@ static int wm8958_put_mbc_enum(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol);struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec);struct wm8994 *control = wm8994->wm8994; -int value = ucontrol->value.integer.value[0 ]; +int value = ucontrol->value.enumerated.item[0 ];int reg;/* Don't allow on the fly reconfiguration */
@@ -549,7 +549,7 @@ static int wm8958_put_vss_enum(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol);struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec);struct wm8994 *control = wm8994->wm8994; -int value = ucontrol->value.integer.value[0 ]; +int value = ucontrol->value.enumerated.item[0 ];int reg;/* Don't allow on the fly reconfiguration */
@@ -582,7 +582,7 @@ static int wm8958_put_vss_hpf_enum(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol);struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec);struct wm8994 *control = wm8994->wm8994; -int value = ucontrol->value.integer.value[0 ]; +int value = ucontrol->value.enumerated.item[0 ];int reg;/* Don't allow on the fly reconfiguration */
@@ -749,7 +749,7 @@ static int wm8958_put_enh_eq_enum(struct snd_kcontrol *kcontrol,struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol);struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec);struct wm8994 *control = wm8994->wm8994; -int value = ucontrol->value.integer.value[0 ]; +int value = ucontrol->value.enumerated.item[0 ];int reg;/* Don't allow on the fly reconfiguration */
sound/soc/codecs/wm8994.c +2 -2
@@ -360,7 +360,7 @@ static int wm8994_put_drc_enum(struct snd_kcontrol *kcontrol,struct wm8994 *control = wm8994->wm8994;struct wm8994_pdata *pdata = &control->pdata;int drc =wm8994_get_drc (kcontrol->id.name); -int value = ucontrol->value.integer.value[0 ]; +int value = ucontrol->value.enumerated.item[0 ];if (drc <0 )return drc;
@@ -467,7 +467,7 @@ static int wm8994_put_retune_mobile_enum(struct snd_kcontrol *kcontrol,struct wm8994 *control = wm8994->wm8994;struct wm8994_pdata *pdata = &control->pdata;int block =wm8994_get_retune_mobile_block (kcontrol->id.name); -int value = ucontrol->value.integer.value[0 ]; +int value = ucontrol->value.enumerated.item[0 ];if (block <0 )return block;
tools/testing/selftests/efivarfs/efivarfs.sh +16 -3
@@ -88,7 +88,11 @@ test_delete() exit 1 fi - rm $file + rm $file 2>/dev/null + if [ $? -ne 0 ]; then + chattr -i $file + rm $file + fi if [ -e $file ]; then echo "$file couldn't be deleted" >&2
@@ -111,6 +115,7 @@ test_zero_size_delete() exit 1 fi + chattr -i $file printf "$attrs" > $file if [ -e $file ]; then
@@ -141,7 +146,11 @@ test_valid_filenames() echo "$file could not be created" >&2 ret=1 else - rm $file + rm $file 2>/dev/null + if [ $? -ne 0 ]; then + chattr -i $file + rm $file + fi fi done
@@ -174,7 +183,11 @@ test_invalid_filenames() if [ -e $file ]; then echo "Creating $file should have failed" >&2 - rm $file + rm $file 2>/dev/null + if [ $? -ne 0 ]; then + chattr -i $file + rm $file + fi ret=1 fi done
tools/testing/selftests/efivarfs/open-unlink.c +71 -1
94 lines not on this page · raw message