Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
fix setattr error handling in sysfs, configfs
kobject: free memory if netlink_kernel_create() fails
lib/kobject_uevent.c: fix CONIG_NET=n warning
+11
-7
+4
-5
fs/configfs/inode.c
+4
-5
fs/configfs/inode.c
···
72
72
if (!sd)
73
73
return -EINVAL;
74
74
75
-
error = simple_setattr(dentry, iattr);
76
-
if (error)
77
-
return error;
78
-
79
75
sd_iattr = sd->s_iattr;
80
76
if (!sd_iattr) {
81
77
/* setting attributes for the first time, allocate now */
···
85
89
sd_iattr->ia_atime = sd_iattr->ia_mtime = sd_iattr->ia_ctime = CURRENT_TIME;
86
90
sd->s_iattr = sd_iattr;
87
91
}
88
-
89
92
/* attributes were changed atleast once in past */
93
+
94
+
error = simple_setattr(dentry, iattr);
95
+
if (error)
96
+
return error;
90
97
91
98
if (ia_valid & ATTR_UID)
92
99
sd_iattr->ia_uid = iattr->ia_uid;
+4
-2
fs/sysfs/inode.c
+4
-2
fs/sysfs/inode.c
···
117
117
if (error)
118
118
goto out;
119
119
120
+
error = sysfs_sd_setattr(sd, iattr);
121
+
if (error)
122
+
goto out;
123
+
120
124
/* this ignores size changes */
121
125
generic_setattr(inode, iattr);
122
-
123
-
error = sysfs_sd_setattr(sd, iattr);
124
126
125
127
out:
126
128
mutex_unlock(&sysfs_mutex);
+3
lib/kobject_uevent.c
+3
lib/kobject_uevent.c
···
83
83
return ret;
84
84
}
85
85
86
+
#ifdef CONFIG_NET
86
87
static int kobj_bcast_filter(struct sock *dsk, struct sk_buff *skb, void *data)
87
88
{
88
89
struct kobject *kobj = data;
···
99
98
100
99
return 0;
101
100
}
101
+
#endif
102
102
103
103
static int kobj_usermode_filter(struct kobject *kobj)
104
104
{
···
380
378
if (!ue_sk->sk) {
381
379
printk(KERN_ERR
382
380
"kobject_uevent: unable to create netlink socket!\n");
381
+
kfree(ue_sk);
383
382
return -ENODEV;
384
383
}
385
384
mutex_lock(&uevent_sock_mutex);