summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.23/0020-dm-persistent-data-handle-space-map-checker-creation.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.23/0020-dm-persistent-data-handle-space-map-checker-creation.patch')
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.23/0020-dm-persistent-data-handle-space-map-checker-creation.patch182
1 files changed, 182 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.23/0020-dm-persistent-data-handle-space-map-checker-creation.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.23/0020-dm-persistent-data-handle-space-map-checker-creation.patch
new file mode 100644
index 00000000..f186538d
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.23/0020-dm-persistent-data-handle-space-map-checker-creation.patch
@@ -0,0 +1,182 @@
1From 5ac62b535b410eb5bfbb5457703fd42f5b517088 Mon Sep 17 00:00:00 2001
2From: Mike Snitzer <snitzer@redhat.com>
3Date: Tue, 3 Jul 2012 12:55:35 +0100
4Subject: [PATCH 20/49] dm persistent data: handle space map checker creation
5 failure
6
7commit 62662303e7f590fdfbb0070ab820a0ad4267c119 upstream.
8
9If CONFIG_DM_DEBUG_SPACE_MAPS is enabled and dm_sm_checker_create()
10fails, dm_tm_create_internal() would still return success even though it
11cleaned up all resources it was supposed to have created. This will
12lead to a kernel crash:
13
14general protection fault: 0000 [#1] SMP DEBUG_PAGEALLOC
15...
16RIP: 0010:[<ffffffff81593659>] [<ffffffff81593659>] dm_bufio_get_block_size+0x9/0x20
17Call Trace:
18 [<ffffffff81599bae>] dm_bm_block_size+0xe/0x10
19 [<ffffffff8159b8b8>] sm_ll_init+0x78/0xd0
20 [<ffffffff8159c1a6>] sm_ll_new_disk+0x16/0xa0
21 [<ffffffff8159c98e>] dm_sm_disk_create+0xfe/0x160
22 [<ffffffff815abf6e>] dm_pool_metadata_open+0x16e/0x6a0
23 [<ffffffff815aa010>] pool_ctr+0x3f0/0x900
24 [<ffffffff8158d565>] dm_table_add_target+0x195/0x450
25 [<ffffffff815904c4>] table_load+0xe4/0x330
26 [<ffffffff815917ea>] ctl_ioctl+0x15a/0x2c0
27 [<ffffffff81591963>] dm_ctl_ioctl+0x13/0x20
28 [<ffffffff8116a4f8>] do_vfs_ioctl+0x98/0x560
29 [<ffffffff8116aa51>] sys_ioctl+0x91/0xa0
30 [<ffffffff81869f52>] system_call_fastpath+0x16/0x1b
31
32Fix the space map checker code to return an appropriate ERR_PTR and have
33dm_sm_disk_create() and dm_tm_create_internal() check for it with
34IS_ERR.
35
36Reported-by: Vivek Goyal <vgoyal@redhat.com>
37Signed-off-by: Mike Snitzer <snitzer@redhat.com>
38Signed-off-by: Alasdair G Kergon <agk@redhat.com>
39Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
40---
41 drivers/md/persistent-data/dm-space-map-checker.c | 24 ++++++++++----------
42 drivers/md/persistent-data/dm-space-map-disk.c | 11 ++++++++-
43 .../md/persistent-data/dm-transaction-manager.c | 8 +++++--
44 3 files changed, 28 insertions(+), 15 deletions(-)
45
46diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
47index 50ed53b..6d7c832 100644
48--- a/drivers/md/persistent-data/dm-space-map-checker.c
49+++ b/drivers/md/persistent-data/dm-space-map-checker.c
50@@ -343,25 +343,25 @@ struct dm_space_map *dm_sm_checker_create(struct dm_space_map *sm)
51 int r;
52 struct sm_checker *smc;
53
54- if (!sm)
55- return NULL;
56+ if (IS_ERR_OR_NULL(sm))
57+ return ERR_PTR(-EINVAL);
58
59 smc = kmalloc(sizeof(*smc), GFP_KERNEL);
60 if (!smc)
61- return NULL;
62+ return ERR_PTR(-ENOMEM);
63
64 memcpy(&smc->sm, &ops_, sizeof(smc->sm));
65 r = ca_create(&smc->old_counts, sm);
66 if (r) {
67 kfree(smc);
68- return NULL;
69+ return ERR_PTR(r);
70 }
71
72 r = ca_create(&smc->counts, sm);
73 if (r) {
74 ca_destroy(&smc->old_counts);
75 kfree(smc);
76- return NULL;
77+ return ERR_PTR(r);
78 }
79
80 smc->real_sm = sm;
81@@ -371,7 +371,7 @@ struct dm_space_map *dm_sm_checker_create(struct dm_space_map *sm)
82 ca_destroy(&smc->counts);
83 ca_destroy(&smc->old_counts);
84 kfree(smc);
85- return NULL;
86+ return ERR_PTR(r);
87 }
88
89 r = ca_commit(&smc->old_counts, &smc->counts);
90@@ -379,7 +379,7 @@ struct dm_space_map *dm_sm_checker_create(struct dm_space_map *sm)
91 ca_destroy(&smc->counts);
92 ca_destroy(&smc->old_counts);
93 kfree(smc);
94- return NULL;
95+ return ERR_PTR(r);
96 }
97
98 return &smc->sm;
99@@ -391,25 +391,25 @@ struct dm_space_map *dm_sm_checker_create_fresh(struct dm_space_map *sm)
100 int r;
101 struct sm_checker *smc;
102
103- if (!sm)
104- return NULL;
105+ if (IS_ERR_OR_NULL(sm))
106+ return ERR_PTR(-EINVAL);
107
108 smc = kmalloc(sizeof(*smc), GFP_KERNEL);
109 if (!smc)
110- return NULL;
111+ return ERR_PTR(-ENOMEM);
112
113 memcpy(&smc->sm, &ops_, sizeof(smc->sm));
114 r = ca_create(&smc->old_counts, sm);
115 if (r) {
116 kfree(smc);
117- return NULL;
118+ return ERR_PTR(r);
119 }
120
121 r = ca_create(&smc->counts, sm);
122 if (r) {
123 ca_destroy(&smc->old_counts);
124 kfree(smc);
125- return NULL;
126+ return ERR_PTR(r);
127 }
128
129 smc->real_sm = sm;
130diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
131index fc469ba..3d0ed53 100644
132--- a/drivers/md/persistent-data/dm-space-map-disk.c
133+++ b/drivers/md/persistent-data/dm-space-map-disk.c
134@@ -290,7 +290,16 @@ struct dm_space_map *dm_sm_disk_create(struct dm_transaction_manager *tm,
135 dm_block_t nr_blocks)
136 {
137 struct dm_space_map *sm = dm_sm_disk_create_real(tm, nr_blocks);
138- return dm_sm_checker_create_fresh(sm);
139+ struct dm_space_map *smc;
140+
141+ if (IS_ERR_OR_NULL(sm))
142+ return sm;
143+
144+ smc = dm_sm_checker_create_fresh(sm);
145+ if (IS_ERR(smc))
146+ dm_sm_destroy(sm);
147+
148+ return smc;
149 }
150 EXPORT_SYMBOL_GPL(dm_sm_disk_create);
151
152diff --git a/drivers/md/persistent-data/dm-transaction-manager.c b/drivers/md/persistent-data/dm-transaction-manager.c
153index e5902d1..ba54aac 100644
154--- a/drivers/md/persistent-data/dm-transaction-manager.c
155+++ b/drivers/md/persistent-data/dm-transaction-manager.c
156@@ -345,8 +345,10 @@ static int dm_tm_create_internal(struct dm_block_manager *bm,
157 }
158
159 *sm = dm_sm_checker_create(inner);
160- if (!*sm)
161+ if (IS_ERR(*sm)) {
162+ r = PTR_ERR(*sm);
163 goto bad2;
164+ }
165
166 } else {
167 r = dm_bm_write_lock(dm_tm_get_bm(*tm), sb_location,
168@@ -365,8 +367,10 @@ static int dm_tm_create_internal(struct dm_block_manager *bm,
169 }
170
171 *sm = dm_sm_checker_create(inner);
172- if (!*sm)
173+ if (IS_ERR(*sm)) {
174+ r = PTR_ERR(*sm);
175 goto bad2;
176+ }
177 }
178
179 return 0;
180--
1811.7.10
182
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-26 09:45:42 +0000