SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - prepared for 2.6.17.13.
cieciwa
cieciwa at pld-linux.org
Tue Sep 12 20:51:12 CEST 2006
Author: cieciwa Date: Tue Sep 12 18:51:12 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- prepared for 2.6.17.13.
---- Files affected:
SOURCES:
linux-2.6-vs2.1.patch (1.1.2.32 -> 1.1.2.33)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.32 SOURCES/linux-2.6-vs2.1.patch:1.1.2.33
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.32 Tue Aug 29 14:55:41 2006
+++ SOURCES/linux-2.6-vs2.1.patch Tue Sep 12 20:51:03 2006
@@ -3207,22 +3207,22 @@
unsigned int h = hash_str(str);
list_for_each_entry (hc, _name_buckets + h, name_list)
-- if (!strcmp(hc->name, str))
+- if (!strcmp(hc->name, str)) {
+ if (vx_check(dm_get_xid(hc->md), VX_WATCH_P|VX_IDENT) &&
-+ !strcmp(hc->name, str))
++ !strcmp(hc->name, str)) {
+ dm_get(hc->md);
return hc;
-
- return NULL;
+ }
@@ -114,7 +115,8 @@ static struct hash_cell *__get_uuid_cell
unsigned int h = hash_str(str);
list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
-- if (!strcmp(hc->uuid, str))
+- if (!strcmp(hc->uuid, str)) {
+ if (vx_check(dm_get_xid(hc->md), VX_WATCH_P|VX_IDENT) &&
-+ !strcmp(hc->uuid, str))
++ !strcmp(hc->uuid, str)) {
+ dm_get(hc->md);
return hc;
-
- return NULL;
+ }
@@ -344,6 +346,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
static int remove_all(struct dm_ioctl *param, size_t param_size)
@@ -3254,13 +3254,13 @@
@@ -612,7 +621,8 @@ static struct hash_cell *__find_device_h
md = dm_get_md(huge_decode_dev(param->dev));
- if (md) {
+ if (md)
- mdptr = dm_get_mdptr(md);
+ if (vx_check(dm_get_xid(md), VX_WATCH_P|VX_IDENT))
+ mdptr = dm_get_mdptr(md);
- dm_put(md);
- }
+ return mdptr;
+ }
@@ -1390,8 +1400,8 @@ static int ctl_ioctl(struct inode *inode
ioctl_fn fn = NULL;
size_t param_size;
@@ -3289,9 +3289,9 @@
md = inode->i_bdev->bd_disk->private_data;
+ if (!vx_check(md->xid, VX_IDENT))
+ return -EACCES;
- dm_get(md);
- return 0;
- }
+ if (!md)
+ goto out;
+
@@ -352,6 +355,14 @@ int dm_set_geometry(struct mapped_device
return 0;
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.1.patch?r1=1.1.2.32&r2=1.1.2.33&f=u
More information about the pld-cvs-commit
mailing list