1 // SPDX-License-Identifier: GPL-2.0-or-later <<
2 /* 1 /*
3 * Copyright (C) 2011 Instituto Nokia de Tecno 2 * Copyright (C) 2011 Instituto Nokia de Tecnologia
4 * 3 *
5 * Authors: 4 * Authors:
6 * Lauro Ramos Venancio <lauro.venancio@ope 5 * Lauro Ramos Venancio <lauro.venancio@openbossa.org>
7 * Aloisio Almeida Jr <aloisio.almeida@open 6 * Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
8 * 7 *
9 * Vendor commands implementation based on net 8 * Vendor commands implementation based on net/wireless/nl80211.c
10 * which is: 9 * which is:
11 * 10 *
12 * Copyright 2006-2010 Johannes Berg <johanne 11 * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
13 * Copyright 2013-2014 Intel Mobile Communica 12 * Copyright 2013-2014 Intel Mobile Communications GmbH
>> 13 *
>> 14 * This program is free software; you can redistribute it and/or modify
>> 15 * it under the terms of the GNU General Public License as published by
>> 16 * the Free Software Foundation; either version 2 of the License, or
>> 17 * (at your option) any later version.
>> 18 *
>> 19 * This program is distributed in the hope that it will be useful,
>> 20 * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> 21 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> 22 * GNU General Public License for more details.
>> 23 *
>> 24 * You should have received a copy of the GNU General Public License
>> 25 * along with this program; if not, see <http://www.gnu.org/licenses/>.
14 */ 26 */
15 27
16 #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fm 28 #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
17 29
18 #include <net/genetlink.h> 30 #include <net/genetlink.h>
19 #include <linux/nfc.h> 31 #include <linux/nfc.h>
20 #include <linux/slab.h> 32 #include <linux/slab.h>
21 33
22 #include "nfc.h" 34 #include "nfc.h"
23 #include "llcp.h" 35 #include "llcp.h"
24 36
25 static const struct genl_multicast_group nfc_g 37 static const struct genl_multicast_group nfc_genl_mcgrps[] = {
26 { .name = NFC_GENL_MCAST_EVENT_NAME, } 38 { .name = NFC_GENL_MCAST_EVENT_NAME, },
27 }; 39 };
28 40
29 static struct genl_family nfc_genl_family; 41 static struct genl_family nfc_genl_family;
30 static const struct nla_policy nfc_genl_policy 42 static const struct nla_policy nfc_genl_policy[NFC_ATTR_MAX + 1] = {
31 [NFC_ATTR_DEVICE_INDEX] = { .type = NL 43 [NFC_ATTR_DEVICE_INDEX] = { .type = NLA_U32 },
32 [NFC_ATTR_DEVICE_NAME] = { .type = NLA 44 [NFC_ATTR_DEVICE_NAME] = { .type = NLA_STRING,
33 .len = NFC_DEV 45 .len = NFC_DEVICE_NAME_MAXSIZE },
34 [NFC_ATTR_PROTOCOLS] = { .type = NLA_U 46 [NFC_ATTR_PROTOCOLS] = { .type = NLA_U32 },
35 [NFC_ATTR_TARGET_INDEX] = { .type = NL <<
36 [NFC_ATTR_COMM_MODE] = { .type = NLA_U 47 [NFC_ATTR_COMM_MODE] = { .type = NLA_U8 },
37 [NFC_ATTR_RF_MODE] = { .type = NLA_U8 48 [NFC_ATTR_RF_MODE] = { .type = NLA_U8 },
38 [NFC_ATTR_DEVICE_POWERED] = { .type = 49 [NFC_ATTR_DEVICE_POWERED] = { .type = NLA_U8 },
39 [NFC_ATTR_IM_PROTOCOLS] = { .type = NL 50 [NFC_ATTR_IM_PROTOCOLS] = { .type = NLA_U32 },
40 [NFC_ATTR_TM_PROTOCOLS] = { .type = NL 51 [NFC_ATTR_TM_PROTOCOLS] = { .type = NLA_U32 },
41 [NFC_ATTR_LLC_PARAM_LTO] = { .type = N 52 [NFC_ATTR_LLC_PARAM_LTO] = { .type = NLA_U8 },
42 [NFC_ATTR_LLC_PARAM_RW] = { .type = NL 53 [NFC_ATTR_LLC_PARAM_RW] = { .type = NLA_U8 },
43 [NFC_ATTR_LLC_PARAM_MIUX] = { .type = 54 [NFC_ATTR_LLC_PARAM_MIUX] = { .type = NLA_U16 },
44 [NFC_ATTR_LLC_SDP] = { .type = NLA_NES 55 [NFC_ATTR_LLC_SDP] = { .type = NLA_NESTED },
45 [NFC_ATTR_FIRMWARE_NAME] = { .type = N 56 [NFC_ATTR_FIRMWARE_NAME] = { .type = NLA_STRING,
46 .len = NF 57 .len = NFC_FIRMWARE_NAME_MAXSIZE },
47 [NFC_ATTR_SE_INDEX] = { .type = NLA_U3 <<
48 [NFC_ATTR_SE_APDU] = { .type = NLA_BIN 58 [NFC_ATTR_SE_APDU] = { .type = NLA_BINARY },
49 [NFC_ATTR_VENDOR_ID] = { .type = NLA_U <<
50 [NFC_ATTR_VENDOR_SUBCMD] = { .type = N <<
51 [NFC_ATTR_VENDOR_DATA] = { .type = NLA 59 [NFC_ATTR_VENDOR_DATA] = { .type = NLA_BINARY },
52 60
53 }; 61 };
54 62
55 static const struct nla_policy nfc_sdp_genl_po 63 static const struct nla_policy nfc_sdp_genl_policy[NFC_SDP_ATTR_MAX + 1] = {
56 [NFC_SDP_ATTR_URI] = { .type = NLA_STR !! 64 [NFC_SDP_ATTR_URI] = { .type = NLA_STRING },
57 .len = U8_MAX - <<
58 [NFC_SDP_ATTR_SAP] = { .type = NLA_U8 65 [NFC_SDP_ATTR_SAP] = { .type = NLA_U8 },
59 }; 66 };
60 67
61 static int nfc_genl_send_target(struct sk_buff 68 static int nfc_genl_send_target(struct sk_buff *msg, struct nfc_target *target,
62 struct netlink 69 struct netlink_callback *cb, int flags)
63 { 70 {
64 void *hdr; 71 void *hdr;
65 72
66 hdr = genlmsg_put(msg, NETLINK_CB(cb-> 73 hdr = genlmsg_put(msg, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq,
67 &nfc_genl_family, fl 74 &nfc_genl_family, flags, NFC_CMD_GET_TARGET);
68 if (!hdr) 75 if (!hdr)
69 return -EMSGSIZE; 76 return -EMSGSIZE;
70 77
71 genl_dump_check_consistent(cb, hdr); !! 78 genl_dump_check_consistent(cb, hdr, &nfc_genl_family);
72 79
73 if (nla_put_u32(msg, NFC_ATTR_TARGET_I 80 if (nla_put_u32(msg, NFC_ATTR_TARGET_INDEX, target->idx) ||
74 nla_put_u32(msg, NFC_ATTR_PROTOCOL 81 nla_put_u32(msg, NFC_ATTR_PROTOCOLS, target->supported_protocols) ||
75 nla_put_u16(msg, NFC_ATTR_TARGET_S 82 nla_put_u16(msg, NFC_ATTR_TARGET_SENS_RES, target->sens_res) ||
76 nla_put_u8(msg, NFC_ATTR_TARGET_SE 83 nla_put_u8(msg, NFC_ATTR_TARGET_SEL_RES, target->sel_res))
77 goto nla_put_failure; 84 goto nla_put_failure;
78 if (target->nfcid1_len > 0 && 85 if (target->nfcid1_len > 0 &&
79 nla_put(msg, NFC_ATTR_TARGET_NFCID 86 nla_put(msg, NFC_ATTR_TARGET_NFCID1, target->nfcid1_len,
80 target->nfcid1)) 87 target->nfcid1))
81 goto nla_put_failure; 88 goto nla_put_failure;
82 if (target->sensb_res_len > 0 && 89 if (target->sensb_res_len > 0 &&
83 nla_put(msg, NFC_ATTR_TARGET_SENSB 90 nla_put(msg, NFC_ATTR_TARGET_SENSB_RES, target->sensb_res_len,
84 target->sensb_res)) 91 target->sensb_res))
85 goto nla_put_failure; 92 goto nla_put_failure;
86 if (target->sensf_res_len > 0 && 93 if (target->sensf_res_len > 0 &&
87 nla_put(msg, NFC_ATTR_TARGET_SENSF 94 nla_put(msg, NFC_ATTR_TARGET_SENSF_RES, target->sensf_res_len,
88 target->sensf_res)) 95 target->sensf_res))
89 goto nla_put_failure; 96 goto nla_put_failure;
90 97
91 if (target->is_iso15693) { 98 if (target->is_iso15693) {
92 if (nla_put_u8(msg, NFC_ATTR_T 99 if (nla_put_u8(msg, NFC_ATTR_TARGET_ISO15693_DSFID,
93 target->iso1569 100 target->iso15693_dsfid) ||
94 nla_put(msg, NFC_ATTR_TARG 101 nla_put(msg, NFC_ATTR_TARGET_ISO15693_UID,
95 sizeof(target->iso 102 sizeof(target->iso15693_uid), target->iso15693_uid))
96 goto nla_put_failure; 103 goto nla_put_failure;
97 } 104 }
98 105
99 genlmsg_end(msg, hdr); 106 genlmsg_end(msg, hdr);
100 return 0; 107 return 0;
101 108
102 nla_put_failure: 109 nla_put_failure:
103 genlmsg_cancel(msg, hdr); 110 genlmsg_cancel(msg, hdr);
104 return -EMSGSIZE; 111 return -EMSGSIZE;
105 } 112 }
106 113
107 static struct nfc_dev *__get_device_from_cb(st 114 static struct nfc_dev *__get_device_from_cb(struct netlink_callback *cb)
108 { 115 {
109 const struct genl_dumpit_info *info = !! 116 struct nlattr **attrbuf = genl_family_attrbuf(&nfc_genl_family);
110 struct nfc_dev *dev; 117 struct nfc_dev *dev;
>> 118 int rc;
111 u32 idx; 119 u32 idx;
112 120
113 if (!info->info.attrs[NFC_ATTR_DEVICE_ !! 121 rc = nlmsg_parse(cb->nlh, GENL_HDRLEN + nfc_genl_family.hdrsize,
>> 122 attrbuf, nfc_genl_family.maxattr, nfc_genl_policy,
>> 123 NULL);
>> 124 if (rc < 0)
>> 125 return ERR_PTR(rc);
>> 126
>> 127 if (!attrbuf[NFC_ATTR_DEVICE_INDEX])
114 return ERR_PTR(-EINVAL); 128 return ERR_PTR(-EINVAL);
115 129
116 idx = nla_get_u32(info->info.attrs[NFC !! 130 idx = nla_get_u32(attrbuf[NFC_ATTR_DEVICE_INDEX]);
117 131
118 dev = nfc_get_device(idx); 132 dev = nfc_get_device(idx);
119 if (!dev) 133 if (!dev)
120 return ERR_PTR(-ENODEV); 134 return ERR_PTR(-ENODEV);
121 135
122 return dev; 136 return dev;
123 } 137 }
124 138
125 static int nfc_genl_dump_targets(struct sk_buf 139 static int nfc_genl_dump_targets(struct sk_buff *skb,
126 struct netlin 140 struct netlink_callback *cb)
127 { 141 {
128 int i = cb->args[0]; 142 int i = cb->args[0];
129 struct nfc_dev *dev = (struct nfc_dev 143 struct nfc_dev *dev = (struct nfc_dev *) cb->args[1];
130 int rc; 144 int rc;
131 145
132 if (!dev) { 146 if (!dev) {
133 dev = __get_device_from_cb(cb) 147 dev = __get_device_from_cb(cb);
134 if (IS_ERR(dev)) 148 if (IS_ERR(dev))
135 return PTR_ERR(dev); 149 return PTR_ERR(dev);
136 150
137 cb->args[1] = (long) dev; 151 cb->args[1] = (long) dev;
138 } 152 }
139 153
140 device_lock(&dev->dev); 154 device_lock(&dev->dev);
141 155
142 cb->seq = dev->targets_generation; 156 cb->seq = dev->targets_generation;
143 157
144 while (i < dev->n_targets) { 158 while (i < dev->n_targets) {
145 rc = nfc_genl_send_target(skb, 159 rc = nfc_genl_send_target(skb, &dev->targets[i], cb,
146 NLM_ 160 NLM_F_MULTI);
147 if (rc < 0) 161 if (rc < 0)
148 break; 162 break;
149 163
150 i++; 164 i++;
151 } 165 }
152 166
153 device_unlock(&dev->dev); 167 device_unlock(&dev->dev);
154 168
155 cb->args[0] = i; 169 cb->args[0] = i;
156 170
157 return skb->len; 171 return skb->len;
158 } 172 }
159 173
160 static int nfc_genl_dump_targets_done(struct n 174 static int nfc_genl_dump_targets_done(struct netlink_callback *cb)
161 { 175 {
162 struct nfc_dev *dev = (struct nfc_dev 176 struct nfc_dev *dev = (struct nfc_dev *) cb->args[1];
163 177
164 if (dev) 178 if (dev)
165 nfc_put_device(dev); 179 nfc_put_device(dev);
166 180
167 return 0; 181 return 0;
168 } 182 }
169 183
170 int nfc_genl_targets_found(struct nfc_dev *dev 184 int nfc_genl_targets_found(struct nfc_dev *dev)
171 { 185 {
172 struct sk_buff *msg; 186 struct sk_buff *msg;
173 void *hdr; 187 void *hdr;
174 188
175 dev->genl_data.poll_req_portid = 0; 189 dev->genl_data.poll_req_portid = 0;
176 190
177 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 191 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
178 if (!msg) 192 if (!msg)
179 return -ENOMEM; 193 return -ENOMEM;
180 194
181 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 195 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
182 NFC_EVENT_TARGETS_FO 196 NFC_EVENT_TARGETS_FOUND);
183 if (!hdr) 197 if (!hdr)
184 goto free_msg; 198 goto free_msg;
185 199
186 if (nla_put_u32(msg, NFC_ATTR_DEVICE_I 200 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx))
187 goto nla_put_failure; 201 goto nla_put_failure;
188 202
189 genlmsg_end(msg, hdr); 203 genlmsg_end(msg, hdr);
190 204
191 return genlmsg_multicast(&nfc_genl_fam 205 return genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_ATOMIC);
192 206
193 nla_put_failure: 207 nla_put_failure:
>> 208 genlmsg_cancel(msg, hdr);
194 free_msg: 209 free_msg:
195 nlmsg_free(msg); 210 nlmsg_free(msg);
196 return -EMSGSIZE; 211 return -EMSGSIZE;
197 } 212 }
198 213
199 int nfc_genl_target_lost(struct nfc_dev *dev, 214 int nfc_genl_target_lost(struct nfc_dev *dev, u32 target_idx)
200 { 215 {
201 struct sk_buff *msg; 216 struct sk_buff *msg;
202 void *hdr; 217 void *hdr;
203 218
204 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 219 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
205 if (!msg) 220 if (!msg)
206 return -ENOMEM; 221 return -ENOMEM;
207 222
208 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 223 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
209 NFC_EVENT_TARGET_LOS 224 NFC_EVENT_TARGET_LOST);
210 if (!hdr) 225 if (!hdr)
211 goto free_msg; 226 goto free_msg;
212 227
213 if (nla_put_string(msg, NFC_ATTR_DEVIC 228 if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)) ||
214 nla_put_u32(msg, NFC_ATTR_TARGET_I 229 nla_put_u32(msg, NFC_ATTR_TARGET_INDEX, target_idx))
215 goto nla_put_failure; 230 goto nla_put_failure;
216 231
217 genlmsg_end(msg, hdr); 232 genlmsg_end(msg, hdr);
218 233
219 genlmsg_multicast(&nfc_genl_family, ms 234 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_KERNEL);
220 235
221 return 0; 236 return 0;
222 237
223 nla_put_failure: 238 nla_put_failure:
>> 239 genlmsg_cancel(msg, hdr);
224 free_msg: 240 free_msg:
225 nlmsg_free(msg); 241 nlmsg_free(msg);
226 return -EMSGSIZE; 242 return -EMSGSIZE;
227 } 243 }
228 244
229 int nfc_genl_tm_activated(struct nfc_dev *dev, 245 int nfc_genl_tm_activated(struct nfc_dev *dev, u32 protocol)
230 { 246 {
231 struct sk_buff *msg; 247 struct sk_buff *msg;
232 void *hdr; 248 void *hdr;
233 249
234 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 250 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
235 if (!msg) 251 if (!msg)
236 return -ENOMEM; 252 return -ENOMEM;
237 253
238 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 254 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
239 NFC_EVENT_TM_ACTIVAT 255 NFC_EVENT_TM_ACTIVATED);
240 if (!hdr) 256 if (!hdr)
241 goto free_msg; 257 goto free_msg;
242 258
243 if (nla_put_u32(msg, NFC_ATTR_DEVICE_I 259 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx))
244 goto nla_put_failure; 260 goto nla_put_failure;
245 if (nla_put_u32(msg, NFC_ATTR_TM_PROTO 261 if (nla_put_u32(msg, NFC_ATTR_TM_PROTOCOLS, protocol))
246 goto nla_put_failure; 262 goto nla_put_failure;
247 263
248 genlmsg_end(msg, hdr); 264 genlmsg_end(msg, hdr);
249 265
250 genlmsg_multicast(&nfc_genl_family, ms 266 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_KERNEL);
251 267
252 return 0; 268 return 0;
253 269
254 nla_put_failure: 270 nla_put_failure:
>> 271 genlmsg_cancel(msg, hdr);
255 free_msg: 272 free_msg:
256 nlmsg_free(msg); 273 nlmsg_free(msg);
257 return -EMSGSIZE; 274 return -EMSGSIZE;
258 } 275 }
259 276
260 int nfc_genl_tm_deactivated(struct nfc_dev *de 277 int nfc_genl_tm_deactivated(struct nfc_dev *dev)
261 { 278 {
262 struct sk_buff *msg; 279 struct sk_buff *msg;
263 void *hdr; 280 void *hdr;
264 281
265 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 282 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
266 if (!msg) 283 if (!msg)
267 return -ENOMEM; 284 return -ENOMEM;
268 285
269 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 286 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
270 NFC_EVENT_TM_DEACTIV 287 NFC_EVENT_TM_DEACTIVATED);
271 if (!hdr) 288 if (!hdr)
272 goto free_msg; 289 goto free_msg;
273 290
274 if (nla_put_u32(msg, NFC_ATTR_DEVICE_I 291 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx))
275 goto nla_put_failure; 292 goto nla_put_failure;
276 293
277 genlmsg_end(msg, hdr); 294 genlmsg_end(msg, hdr);
278 295
279 genlmsg_multicast(&nfc_genl_family, ms 296 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_KERNEL);
280 297
281 return 0; 298 return 0;
282 299
283 nla_put_failure: 300 nla_put_failure:
>> 301 genlmsg_cancel(msg, hdr);
284 free_msg: 302 free_msg:
285 nlmsg_free(msg); 303 nlmsg_free(msg);
286 return -EMSGSIZE; 304 return -EMSGSIZE;
287 } 305 }
288 306
289 static int nfc_genl_setup_device_added(struct 307 static int nfc_genl_setup_device_added(struct nfc_dev *dev, struct sk_buff *msg)
290 { 308 {
291 if (nla_put_string(msg, NFC_ATTR_DEVIC 309 if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)) ||
292 nla_put_u32(msg, NFC_ATTR_DEVICE_I 310 nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) ||
293 nla_put_u32(msg, NFC_ATTR_PROTOCOL 311 nla_put_u32(msg, NFC_ATTR_PROTOCOLS, dev->supported_protocols) ||
294 nla_put_u8(msg, NFC_ATTR_DEVICE_PO 312 nla_put_u8(msg, NFC_ATTR_DEVICE_POWERED, dev->dev_up) ||
295 nla_put_u8(msg, NFC_ATTR_RF_MODE, 313 nla_put_u8(msg, NFC_ATTR_RF_MODE, dev->rf_mode))
296 return -1; 314 return -1;
297 return 0; 315 return 0;
298 } 316 }
299 317
300 int nfc_genl_device_added(struct nfc_dev *dev) 318 int nfc_genl_device_added(struct nfc_dev *dev)
301 { 319 {
302 struct sk_buff *msg; 320 struct sk_buff *msg;
303 void *hdr; 321 void *hdr;
304 322
305 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 323 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
306 if (!msg) 324 if (!msg)
307 return -ENOMEM; 325 return -ENOMEM;
308 326
309 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 327 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
310 NFC_EVENT_DEVICE_ADD 328 NFC_EVENT_DEVICE_ADDED);
311 if (!hdr) 329 if (!hdr)
312 goto free_msg; 330 goto free_msg;
313 331
314 if (nfc_genl_setup_device_added(dev, m 332 if (nfc_genl_setup_device_added(dev, msg))
315 goto nla_put_failure; 333 goto nla_put_failure;
316 334
317 genlmsg_end(msg, hdr); 335 genlmsg_end(msg, hdr);
318 336
319 genlmsg_multicast(&nfc_genl_family, ms 337 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_KERNEL);
320 338
321 return 0; 339 return 0;
322 340
323 nla_put_failure: 341 nla_put_failure:
>> 342 genlmsg_cancel(msg, hdr);
324 free_msg: 343 free_msg:
325 nlmsg_free(msg); 344 nlmsg_free(msg);
326 return -EMSGSIZE; 345 return -EMSGSIZE;
327 } 346 }
328 347
329 int nfc_genl_device_removed(struct nfc_dev *de 348 int nfc_genl_device_removed(struct nfc_dev *dev)
330 { 349 {
331 struct sk_buff *msg; 350 struct sk_buff *msg;
332 void *hdr; 351 void *hdr;
333 352
334 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 353 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
335 if (!msg) 354 if (!msg)
336 return -ENOMEM; 355 return -ENOMEM;
337 356
338 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 357 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
339 NFC_EVENT_DEVICE_REM 358 NFC_EVENT_DEVICE_REMOVED);
340 if (!hdr) 359 if (!hdr)
341 goto free_msg; 360 goto free_msg;
342 361
343 if (nla_put_u32(msg, NFC_ATTR_DEVICE_I 362 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx))
344 goto nla_put_failure; 363 goto nla_put_failure;
345 364
346 genlmsg_end(msg, hdr); 365 genlmsg_end(msg, hdr);
347 366
348 genlmsg_multicast(&nfc_genl_family, ms 367 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_KERNEL);
349 368
350 return 0; 369 return 0;
351 370
352 nla_put_failure: 371 nla_put_failure:
>> 372 genlmsg_cancel(msg, hdr);
353 free_msg: 373 free_msg:
354 nlmsg_free(msg); 374 nlmsg_free(msg);
355 return -EMSGSIZE; 375 return -EMSGSIZE;
356 } 376 }
357 377
358 int nfc_genl_llc_send_sdres(struct nfc_dev *de 378 int nfc_genl_llc_send_sdres(struct nfc_dev *dev, struct hlist_head *sdres_list)
359 { 379 {
360 struct sk_buff *msg; 380 struct sk_buff *msg;
361 struct nlattr *sdp_attr, *uri_attr; 381 struct nlattr *sdp_attr, *uri_attr;
362 struct nfc_llcp_sdp_tlv *sdres; 382 struct nfc_llcp_sdp_tlv *sdres;
363 struct hlist_node *n; 383 struct hlist_node *n;
364 void *hdr; 384 void *hdr;
365 int rc = -EMSGSIZE; 385 int rc = -EMSGSIZE;
366 int i; 386 int i;
367 387
368 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 388 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
369 if (!msg) 389 if (!msg)
370 return -ENOMEM; 390 return -ENOMEM;
371 391
372 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 392 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
373 NFC_EVENT_LLC_SDRES) 393 NFC_EVENT_LLC_SDRES);
374 if (!hdr) 394 if (!hdr)
375 goto free_msg; 395 goto free_msg;
376 396
377 if (nla_put_u32(msg, NFC_ATTR_DEVICE_I 397 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx))
378 goto nla_put_failure; 398 goto nla_put_failure;
379 399
380 sdp_attr = nla_nest_start_noflag(msg, !! 400 sdp_attr = nla_nest_start(msg, NFC_ATTR_LLC_SDP);
381 if (sdp_attr == NULL) { 401 if (sdp_attr == NULL) {
382 rc = -ENOMEM; 402 rc = -ENOMEM;
383 goto nla_put_failure; 403 goto nla_put_failure;
384 } 404 }
385 405
386 i = 1; 406 i = 1;
387 hlist_for_each_entry_safe(sdres, n, sd 407 hlist_for_each_entry_safe(sdres, n, sdres_list, node) {
388 pr_debug("uri: %s, sap: %d\n", 408 pr_debug("uri: %s, sap: %d\n", sdres->uri, sdres->sap);
389 409
390 uri_attr = nla_nest_start_nofl !! 410 uri_attr = nla_nest_start(msg, i++);
391 if (uri_attr == NULL) { 411 if (uri_attr == NULL) {
392 rc = -ENOMEM; 412 rc = -ENOMEM;
393 goto nla_put_failure; 413 goto nla_put_failure;
394 } 414 }
395 415
396 if (nla_put_u8(msg, NFC_SDP_AT 416 if (nla_put_u8(msg, NFC_SDP_ATTR_SAP, sdres->sap))
397 goto nla_put_failure; 417 goto nla_put_failure;
398 418
399 if (nla_put_string(msg, NFC_SD 419 if (nla_put_string(msg, NFC_SDP_ATTR_URI, sdres->uri))
400 goto nla_put_failure; 420 goto nla_put_failure;
401 421
402 nla_nest_end(msg, uri_attr); 422 nla_nest_end(msg, uri_attr);
403 423
404 hlist_del(&sdres->node); 424 hlist_del(&sdres->node);
405 425
406 nfc_llcp_free_sdp_tlv(sdres); 426 nfc_llcp_free_sdp_tlv(sdres);
407 } 427 }
408 428
409 nla_nest_end(msg, sdp_attr); 429 nla_nest_end(msg, sdp_attr);
410 430
411 genlmsg_end(msg, hdr); 431 genlmsg_end(msg, hdr);
412 432
413 return genlmsg_multicast(&nfc_genl_fam 433 return genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_ATOMIC);
414 434
415 nla_put_failure: 435 nla_put_failure:
>> 436 genlmsg_cancel(msg, hdr);
>> 437
416 free_msg: 438 free_msg:
417 nlmsg_free(msg); 439 nlmsg_free(msg);
418 440
419 nfc_llcp_free_sdp_tlv_list(sdres_list) 441 nfc_llcp_free_sdp_tlv_list(sdres_list);
420 442
421 return rc; 443 return rc;
422 } 444 }
423 445
424 int nfc_genl_se_added(struct nfc_dev *dev, u32 446 int nfc_genl_se_added(struct nfc_dev *dev, u32 se_idx, u16 type)
425 { 447 {
426 struct sk_buff *msg; 448 struct sk_buff *msg;
427 void *hdr; 449 void *hdr;
428 450
429 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 451 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
430 if (!msg) 452 if (!msg)
431 return -ENOMEM; 453 return -ENOMEM;
432 454
433 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 455 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
434 NFC_EVENT_SE_ADDED); 456 NFC_EVENT_SE_ADDED);
435 if (!hdr) 457 if (!hdr)
436 goto free_msg; 458 goto free_msg;
437 459
438 if (nla_put_u32(msg, NFC_ATTR_DEVICE_I 460 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) ||
439 nla_put_u32(msg, NFC_ATTR_SE_INDEX 461 nla_put_u32(msg, NFC_ATTR_SE_INDEX, se_idx) ||
440 nla_put_u8(msg, NFC_ATTR_SE_TYPE, 462 nla_put_u8(msg, NFC_ATTR_SE_TYPE, type))
441 goto nla_put_failure; 463 goto nla_put_failure;
442 464
443 genlmsg_end(msg, hdr); 465 genlmsg_end(msg, hdr);
444 466
445 genlmsg_multicast(&nfc_genl_family, ms 467 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_KERNEL);
446 468
447 return 0; 469 return 0;
448 470
449 nla_put_failure: 471 nla_put_failure:
>> 472 genlmsg_cancel(msg, hdr);
450 free_msg: 473 free_msg:
451 nlmsg_free(msg); 474 nlmsg_free(msg);
452 return -EMSGSIZE; 475 return -EMSGSIZE;
453 } 476 }
454 477
455 int nfc_genl_se_removed(struct nfc_dev *dev, u 478 int nfc_genl_se_removed(struct nfc_dev *dev, u32 se_idx)
456 { 479 {
457 struct sk_buff *msg; 480 struct sk_buff *msg;
458 void *hdr; 481 void *hdr;
459 482
460 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 483 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
461 if (!msg) 484 if (!msg)
462 return -ENOMEM; 485 return -ENOMEM;
463 486
464 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 487 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
465 NFC_EVENT_SE_REMOVED 488 NFC_EVENT_SE_REMOVED);
466 if (!hdr) 489 if (!hdr)
467 goto free_msg; 490 goto free_msg;
468 491
469 if (nla_put_u32(msg, NFC_ATTR_DEVICE_I 492 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) ||
470 nla_put_u32(msg, NFC_ATTR_SE_INDEX 493 nla_put_u32(msg, NFC_ATTR_SE_INDEX, se_idx))
471 goto nla_put_failure; 494 goto nla_put_failure;
472 495
473 genlmsg_end(msg, hdr); 496 genlmsg_end(msg, hdr);
474 497
475 genlmsg_multicast(&nfc_genl_family, ms 498 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_KERNEL);
476 499
477 return 0; 500 return 0;
478 501
479 nla_put_failure: 502 nla_put_failure:
>> 503 genlmsg_cancel(msg, hdr);
480 free_msg: 504 free_msg:
481 nlmsg_free(msg); 505 nlmsg_free(msg);
482 return -EMSGSIZE; 506 return -EMSGSIZE;
483 } 507 }
484 508
485 int nfc_genl_se_transaction(struct nfc_dev *de 509 int nfc_genl_se_transaction(struct nfc_dev *dev, u8 se_idx,
486 struct nfc_evt_tra 510 struct nfc_evt_transaction *evt_transaction)
487 { 511 {
488 struct nfc_se *se; 512 struct nfc_se *se;
489 struct sk_buff *msg; 513 struct sk_buff *msg;
490 void *hdr; 514 void *hdr;
491 515
492 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 516 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
493 if (!msg) 517 if (!msg)
494 return -ENOMEM; 518 return -ENOMEM;
495 519
496 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 520 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
497 NFC_EVENT_SE_TRANSAC 521 NFC_EVENT_SE_TRANSACTION);
498 if (!hdr) 522 if (!hdr)
499 goto free_msg; 523 goto free_msg;
500 524
501 se = nfc_find_se(dev, se_idx); 525 se = nfc_find_se(dev, se_idx);
502 if (!se) 526 if (!se)
503 goto free_msg; 527 goto free_msg;
504 528
505 if (nla_put_u32(msg, NFC_ATTR_DEVICE_I 529 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) ||
506 nla_put_u32(msg, NFC_ATTR_SE_INDEX 530 nla_put_u32(msg, NFC_ATTR_SE_INDEX, se_idx) ||
507 nla_put_u8(msg, NFC_ATTR_SE_TYPE, 531 nla_put_u8(msg, NFC_ATTR_SE_TYPE, se->type) ||
508 nla_put(msg, NFC_ATTR_SE_AID, evt_ 532 nla_put(msg, NFC_ATTR_SE_AID, evt_transaction->aid_len,
509 evt_transaction->aid) || 533 evt_transaction->aid) ||
510 nla_put(msg, NFC_ATTR_SE_PARAMS, e 534 nla_put(msg, NFC_ATTR_SE_PARAMS, evt_transaction->params_len,
511 evt_transaction->params)) 535 evt_transaction->params))
512 goto nla_put_failure; 536 goto nla_put_failure;
513 537
514 /* evt_transaction is no more used */ 538 /* evt_transaction is no more used */
515 devm_kfree(&dev->dev, evt_transaction) 539 devm_kfree(&dev->dev, evt_transaction);
516 540
517 genlmsg_end(msg, hdr); 541 genlmsg_end(msg, hdr);
518 542
519 genlmsg_multicast(&nfc_genl_family, ms 543 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_KERNEL);
520 544
521 return 0; 545 return 0;
522 546
523 nla_put_failure: 547 nla_put_failure:
>> 548 genlmsg_cancel(msg, hdr);
524 free_msg: 549 free_msg:
525 /* evt_transaction is no more used */ 550 /* evt_transaction is no more used */
526 devm_kfree(&dev->dev, evt_transaction) 551 devm_kfree(&dev->dev, evt_transaction);
527 nlmsg_free(msg); 552 nlmsg_free(msg);
528 return -EMSGSIZE; 553 return -EMSGSIZE;
529 } 554 }
530 555
531 int nfc_genl_se_connectivity(struct nfc_dev *d 556 int nfc_genl_se_connectivity(struct nfc_dev *dev, u8 se_idx)
532 { 557 {
533 const struct nfc_se *se; !! 558 struct nfc_se *se;
534 struct sk_buff *msg; 559 struct sk_buff *msg;
535 void *hdr; 560 void *hdr;
536 561
537 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 562 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
538 if (!msg) 563 if (!msg)
539 return -ENOMEM; 564 return -ENOMEM;
540 565
541 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 566 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
542 NFC_EVENT_SE_CONNECT 567 NFC_EVENT_SE_CONNECTIVITY);
543 if (!hdr) 568 if (!hdr)
544 goto free_msg; 569 goto free_msg;
545 570
546 se = nfc_find_se(dev, se_idx); 571 se = nfc_find_se(dev, se_idx);
547 if (!se) 572 if (!se)
548 goto free_msg; 573 goto free_msg;
549 574
550 if (nla_put_u32(msg, NFC_ATTR_DEVICE_I 575 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) ||
551 nla_put_u32(msg, NFC_ATTR_SE_INDEX 576 nla_put_u32(msg, NFC_ATTR_SE_INDEX, se_idx) ||
552 nla_put_u8(msg, NFC_ATTR_SE_TYPE, 577 nla_put_u8(msg, NFC_ATTR_SE_TYPE, se->type))
553 goto nla_put_failure; 578 goto nla_put_failure;
554 579
555 genlmsg_end(msg, hdr); 580 genlmsg_end(msg, hdr);
556 581
557 genlmsg_multicast(&nfc_genl_family, ms 582 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_KERNEL);
558 583
559 return 0; 584 return 0;
560 585
561 nla_put_failure: 586 nla_put_failure:
>> 587 genlmsg_cancel(msg, hdr);
562 free_msg: 588 free_msg:
563 nlmsg_free(msg); 589 nlmsg_free(msg);
564 return -EMSGSIZE; 590 return -EMSGSIZE;
565 } 591 }
566 592
567 static int nfc_genl_send_device(struct sk_buff 593 static int nfc_genl_send_device(struct sk_buff *msg, struct nfc_dev *dev,
568 u32 portid, u3 594 u32 portid, u32 seq,
569 struct netlink 595 struct netlink_callback *cb,
570 int flags) 596 int flags)
571 { 597 {
572 void *hdr; 598 void *hdr;
573 599
574 hdr = genlmsg_put(msg, portid, seq, &n 600 hdr = genlmsg_put(msg, portid, seq, &nfc_genl_family, flags,
575 NFC_CMD_GET_DEVICE); 601 NFC_CMD_GET_DEVICE);
576 if (!hdr) 602 if (!hdr)
577 return -EMSGSIZE; 603 return -EMSGSIZE;
578 604
579 if (cb) 605 if (cb)
580 genl_dump_check_consistent(cb, !! 606 genl_dump_check_consistent(cb, hdr, &nfc_genl_family);
581 607
582 if (nfc_genl_setup_device_added(dev, m 608 if (nfc_genl_setup_device_added(dev, msg))
583 goto nla_put_failure; 609 goto nla_put_failure;
584 610
585 genlmsg_end(msg, hdr); 611 genlmsg_end(msg, hdr);
586 return 0; 612 return 0;
587 613
588 nla_put_failure: 614 nla_put_failure:
589 genlmsg_cancel(msg, hdr); 615 genlmsg_cancel(msg, hdr);
590 return -EMSGSIZE; 616 return -EMSGSIZE;
591 } 617 }
592 618
593 static int nfc_genl_dump_devices(struct sk_buf 619 static int nfc_genl_dump_devices(struct sk_buff *skb,
594 struct netlin 620 struct netlink_callback *cb)
595 { 621 {
596 struct class_dev_iter *iter = (struct 622 struct class_dev_iter *iter = (struct class_dev_iter *) cb->args[0];
597 struct nfc_dev *dev = (struct nfc_dev 623 struct nfc_dev *dev = (struct nfc_dev *) cb->args[1];
598 bool first_call = false; 624 bool first_call = false;
599 625
600 if (!iter) { 626 if (!iter) {
601 first_call = true; 627 first_call = true;
602 iter = kmalloc(sizeof(struct c 628 iter = kmalloc(sizeof(struct class_dev_iter), GFP_KERNEL);
603 if (!iter) 629 if (!iter)
604 return -ENOMEM; 630 return -ENOMEM;
605 cb->args[0] = (long) iter; 631 cb->args[0] = (long) iter;
606 } 632 }
607 633
608 mutex_lock(&nfc_devlist_mutex); 634 mutex_lock(&nfc_devlist_mutex);
609 635
610 cb->seq = nfc_devlist_generation; 636 cb->seq = nfc_devlist_generation;
611 637
612 if (first_call) { 638 if (first_call) {
613 nfc_device_iter_init(iter); 639 nfc_device_iter_init(iter);
614 dev = nfc_device_iter_next(ite 640 dev = nfc_device_iter_next(iter);
615 } 641 }
616 642
617 while (dev) { 643 while (dev) {
618 int rc; 644 int rc;
619 645
620 rc = nfc_genl_send_device(skb, 646 rc = nfc_genl_send_device(skb, dev, NETLINK_CB(cb->skb).portid,
621 cb-> 647 cb->nlh->nlmsg_seq, cb, NLM_F_MULTI);
622 if (rc < 0) 648 if (rc < 0)
623 break; 649 break;
624 650
625 dev = nfc_device_iter_next(ite 651 dev = nfc_device_iter_next(iter);
626 } 652 }
627 653
628 mutex_unlock(&nfc_devlist_mutex); 654 mutex_unlock(&nfc_devlist_mutex);
629 655
630 cb->args[1] = (long) dev; 656 cb->args[1] = (long) dev;
631 657
632 return skb->len; 658 return skb->len;
633 } 659 }
634 660
635 static int nfc_genl_dump_devices_done(struct n 661 static int nfc_genl_dump_devices_done(struct netlink_callback *cb)
636 { 662 {
637 struct class_dev_iter *iter = (struct 663 struct class_dev_iter *iter = (struct class_dev_iter *) cb->args[0];
638 664
639 if (iter) { !! 665 nfc_device_iter_exit(iter);
640 nfc_device_iter_exit(iter); !! 666 kfree(iter);
641 kfree(iter); <<
642 } <<
643 667
644 return 0; 668 return 0;
645 } 669 }
646 670
647 int nfc_genl_dep_link_up_event(struct nfc_dev 671 int nfc_genl_dep_link_up_event(struct nfc_dev *dev, u32 target_idx,
648 u8 comm_mode, u 672 u8 comm_mode, u8 rf_mode)
649 { 673 {
650 struct sk_buff *msg; 674 struct sk_buff *msg;
651 void *hdr; 675 void *hdr;
652 676
653 pr_debug("DEP link is up\n"); 677 pr_debug("DEP link is up\n");
654 678
655 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 679 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
656 if (!msg) 680 if (!msg)
657 return -ENOMEM; 681 return -ENOMEM;
658 682
659 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 683 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0, NFC_CMD_DEP_LINK_UP);
660 if (!hdr) 684 if (!hdr)
661 goto free_msg; 685 goto free_msg;
662 686
663 if (nla_put_u32(msg, NFC_ATTR_DEVICE_I 687 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx))
664 goto nla_put_failure; 688 goto nla_put_failure;
665 if (rf_mode == NFC_RF_INITIATOR && 689 if (rf_mode == NFC_RF_INITIATOR &&
666 nla_put_u32(msg, NFC_ATTR_TARGET_I 690 nla_put_u32(msg, NFC_ATTR_TARGET_INDEX, target_idx))
667 goto nla_put_failure; 691 goto nla_put_failure;
668 if (nla_put_u8(msg, NFC_ATTR_COMM_MODE 692 if (nla_put_u8(msg, NFC_ATTR_COMM_MODE, comm_mode) ||
669 nla_put_u8(msg, NFC_ATTR_RF_MODE, 693 nla_put_u8(msg, NFC_ATTR_RF_MODE, rf_mode))
670 goto nla_put_failure; 694 goto nla_put_failure;
671 695
672 genlmsg_end(msg, hdr); 696 genlmsg_end(msg, hdr);
673 697
674 dev->dep_link_up = true; 698 dev->dep_link_up = true;
675 699
676 genlmsg_multicast(&nfc_genl_family, ms 700 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_ATOMIC);
677 701
678 return 0; 702 return 0;
679 703
680 nla_put_failure: 704 nla_put_failure:
>> 705 genlmsg_cancel(msg, hdr);
681 free_msg: 706 free_msg:
682 nlmsg_free(msg); 707 nlmsg_free(msg);
683 return -EMSGSIZE; 708 return -EMSGSIZE;
684 } 709 }
685 710
686 int nfc_genl_dep_link_down_event(struct nfc_de 711 int nfc_genl_dep_link_down_event(struct nfc_dev *dev)
687 { 712 {
688 struct sk_buff *msg; 713 struct sk_buff *msg;
689 void *hdr; 714 void *hdr;
690 715
691 pr_debug("DEP link is down\n"); 716 pr_debug("DEP link is down\n");
692 717
693 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 718 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
694 if (!msg) 719 if (!msg)
695 return -ENOMEM; 720 return -ENOMEM;
696 721
697 hdr = genlmsg_put(msg, 0, 0, &nfc_genl 722 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
698 NFC_CMD_DEP_LINK_DOW 723 NFC_CMD_DEP_LINK_DOWN);
699 if (!hdr) 724 if (!hdr)
700 goto free_msg; 725 goto free_msg;
701 726
702 if (nla_put_u32(msg, NFC_ATTR_DEVICE_I 727 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx))
703 goto nla_put_failure; 728 goto nla_put_failure;
704 729
705 genlmsg_end(msg, hdr); 730 genlmsg_end(msg, hdr);
706 731
707 genlmsg_multicast(&nfc_genl_family, ms 732 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_ATOMIC);
708 733
709 return 0; 734 return 0;
710 735
711 nla_put_failure: 736 nla_put_failure:
>> 737 genlmsg_cancel(msg, hdr);
712 free_msg: 738 free_msg:
713 nlmsg_free(msg); 739 nlmsg_free(msg);
714 return -EMSGSIZE; 740 return -EMSGSIZE;
715 } 741 }
716 742
717 static int nfc_genl_get_device(struct sk_buff 743 static int nfc_genl_get_device(struct sk_buff *skb, struct genl_info *info)
718 { 744 {
719 struct sk_buff *msg; 745 struct sk_buff *msg;
720 struct nfc_dev *dev; 746 struct nfc_dev *dev;
721 u32 idx; 747 u32 idx;
722 int rc = -ENOBUFS; 748 int rc = -ENOBUFS;
723 749
724 if (!info->attrs[NFC_ATTR_DEVICE_INDEX 750 if (!info->attrs[NFC_ATTR_DEVICE_INDEX])
725 return -EINVAL; 751 return -EINVAL;
726 752
727 idx = nla_get_u32(info->attrs[NFC_ATTR 753 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
728 754
729 dev = nfc_get_device(idx); 755 dev = nfc_get_device(idx);
730 if (!dev) 756 if (!dev)
731 return -ENODEV; 757 return -ENODEV;
732 758
733 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GF 759 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
734 if (!msg) { 760 if (!msg) {
735 rc = -ENOMEM; 761 rc = -ENOMEM;
736 goto out_putdev; 762 goto out_putdev;
737 } 763 }
738 764
739 rc = nfc_genl_send_device(msg, dev, in 765 rc = nfc_genl_send_device(msg, dev, info->snd_portid, info->snd_seq,
740 NULL, 0); 766 NULL, 0);
741 if (rc < 0) 767 if (rc < 0)
742 goto out_free; 768 goto out_free;
743 769
744 nfc_put_device(dev); 770 nfc_put_device(dev);
745 771
746 return genlmsg_reply(msg, info); 772 return genlmsg_reply(msg, info);
747 773
748 out_free: 774 out_free:
749 nlmsg_free(msg); 775 nlmsg_free(msg);
750 out_putdev: 776 out_putdev:
751 nfc_put_device(dev); 777 nfc_put_device(dev);
752 return rc; 778 return rc;
753 } 779 }
754 780
755 static int nfc_genl_dev_up(struct sk_buff *skb 781 static int nfc_genl_dev_up(struct sk_buff *skb, struct genl_info *info)
756 { 782 {
757 struct nfc_dev *dev; 783 struct nfc_dev *dev;
758 int rc; 784 int rc;
759 u32 idx; 785 u32 idx;
760 786
761 if (!info->attrs[NFC_ATTR_DEVICE_INDEX 787 if (!info->attrs[NFC_ATTR_DEVICE_INDEX])
762 return -EINVAL; 788 return -EINVAL;
763 789
764 idx = nla_get_u32(info->attrs[NFC_ATTR 790 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
765 791
766 dev = nfc_get_device(idx); 792 dev = nfc_get_device(idx);
767 if (!dev) 793 if (!dev)
768 return -ENODEV; 794 return -ENODEV;
769 795
770 rc = nfc_dev_up(dev); 796 rc = nfc_dev_up(dev);
771 797
772 nfc_put_device(dev); 798 nfc_put_device(dev);
773 return rc; 799 return rc;
774 } 800 }
775 801
776 static int nfc_genl_dev_down(struct sk_buff *s 802 static int nfc_genl_dev_down(struct sk_buff *skb, struct genl_info *info)
777 { 803 {
778 struct nfc_dev *dev; 804 struct nfc_dev *dev;
779 int rc; 805 int rc;
780 u32 idx; 806 u32 idx;
781 807
782 if (!info->attrs[NFC_ATTR_DEVICE_INDEX 808 if (!info->attrs[NFC_ATTR_DEVICE_INDEX])
783 return -EINVAL; 809 return -EINVAL;
784 810
785 idx = nla_get_u32(info->attrs[NFC_ATTR 811 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
786 812
787 dev = nfc_get_device(idx); 813 dev = nfc_get_device(idx);
788 if (!dev) 814 if (!dev)
789 return -ENODEV; 815 return -ENODEV;
790 816
791 rc = nfc_dev_down(dev); 817 rc = nfc_dev_down(dev);
792 818
793 nfc_put_device(dev); 819 nfc_put_device(dev);
794 return rc; 820 return rc;
795 } 821 }
796 822
797 static int nfc_genl_start_poll(struct sk_buff 823 static int nfc_genl_start_poll(struct sk_buff *skb, struct genl_info *info)
798 { 824 {
799 struct nfc_dev *dev; 825 struct nfc_dev *dev;
800 int rc; 826 int rc;
801 u32 idx; 827 u32 idx;
802 u32 im_protocols = 0, tm_protocols = 0 828 u32 im_protocols = 0, tm_protocols = 0;
803 829
804 pr_debug("Poll start\n"); 830 pr_debug("Poll start\n");
805 831
806 if (!info->attrs[NFC_ATTR_DEVICE_INDEX 832 if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
807 ((!info->attrs[NFC_ATTR_IM_PROTOCO 833 ((!info->attrs[NFC_ATTR_IM_PROTOCOLS] &&
808 !info->attrs[NFC_ATTR_PROTOCOLS] 834 !info->attrs[NFC_ATTR_PROTOCOLS]) &&
809 !info->attrs[NFC_ATTR_TM_PROTOCO 835 !info->attrs[NFC_ATTR_TM_PROTOCOLS]))
810 return -EINVAL; 836 return -EINVAL;
811 837
812 idx = nla_get_u32(info->attrs[NFC_ATTR 838 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
813 839
814 if (info->attrs[NFC_ATTR_TM_PROTOCOLS] 840 if (info->attrs[NFC_ATTR_TM_PROTOCOLS])
815 tm_protocols = nla_get_u32(inf 841 tm_protocols = nla_get_u32(info->attrs[NFC_ATTR_TM_PROTOCOLS]);
816 842
817 if (info->attrs[NFC_ATTR_IM_PROTOCOLS] 843 if (info->attrs[NFC_ATTR_IM_PROTOCOLS])
818 im_protocols = nla_get_u32(inf 844 im_protocols = nla_get_u32(info->attrs[NFC_ATTR_IM_PROTOCOLS]);
819 else if (info->attrs[NFC_ATTR_PROTOCOL 845 else if (info->attrs[NFC_ATTR_PROTOCOLS])
820 im_protocols = nla_get_u32(inf 846 im_protocols = nla_get_u32(info->attrs[NFC_ATTR_PROTOCOLS]);
821 847
822 dev = nfc_get_device(idx); 848 dev = nfc_get_device(idx);
823 if (!dev) 849 if (!dev)
824 return -ENODEV; 850 return -ENODEV;
825 851
826 mutex_lock(&dev->genl_data.genl_data_m 852 mutex_lock(&dev->genl_data.genl_data_mutex);
827 853
828 rc = nfc_start_poll(dev, im_protocols, 854 rc = nfc_start_poll(dev, im_protocols, tm_protocols);
829 if (!rc) 855 if (!rc)
830 dev->genl_data.poll_req_portid 856 dev->genl_data.poll_req_portid = info->snd_portid;
831 857
832 mutex_unlock(&dev->genl_data.genl_data 858 mutex_unlock(&dev->genl_data.genl_data_mutex);
833 859
834 nfc_put_device(dev); 860 nfc_put_device(dev);
835 return rc; 861 return rc;
836 } 862 }
837 863
838 static int nfc_genl_stop_poll(struct sk_buff * 864 static int nfc_genl_stop_poll(struct sk_buff *skb, struct genl_info *info)
839 { 865 {
840 struct nfc_dev *dev; 866 struct nfc_dev *dev;
841 int rc; 867 int rc;
842 u32 idx; 868 u32 idx;
843 869
844 if (!info->attrs[NFC_ATTR_DEVICE_INDEX 870 if (!info->attrs[NFC_ATTR_DEVICE_INDEX])
845 return -EINVAL; 871 return -EINVAL;
846 872
847 idx = nla_get_u32(info->attrs[NFC_ATTR 873 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
848 874
849 dev = nfc_get_device(idx); 875 dev = nfc_get_device(idx);
850 if (!dev) 876 if (!dev)
851 return -ENODEV; 877 return -ENODEV;
852 878
853 device_lock(&dev->dev); 879 device_lock(&dev->dev);
854 880
855 if (!dev->polling) { 881 if (!dev->polling) {
856 device_unlock(&dev->dev); 882 device_unlock(&dev->dev);
857 nfc_put_device(dev); <<
858 return -EINVAL; 883 return -EINVAL;
859 } 884 }
860 885
861 device_unlock(&dev->dev); 886 device_unlock(&dev->dev);
862 887
863 mutex_lock(&dev->genl_data.genl_data_m 888 mutex_lock(&dev->genl_data.genl_data_mutex);
864 889
865 if (dev->genl_data.poll_req_portid != 890 if (dev->genl_data.poll_req_portid != info->snd_portid) {
866 rc = -EBUSY; 891 rc = -EBUSY;
867 goto out; 892 goto out;
868 } 893 }
869 894
870 rc = nfc_stop_poll(dev); 895 rc = nfc_stop_poll(dev);
871 dev->genl_data.poll_req_portid = 0; 896 dev->genl_data.poll_req_portid = 0;
872 897
873 out: 898 out:
874 mutex_unlock(&dev->genl_data.genl_data 899 mutex_unlock(&dev->genl_data.genl_data_mutex);
875 nfc_put_device(dev); 900 nfc_put_device(dev);
876 return rc; 901 return rc;
877 } 902 }
878 903
879 static int nfc_genl_activate_target(struct sk_ 904 static int nfc_genl_activate_target(struct sk_buff *skb, struct genl_info *info)
880 { 905 {
881 struct nfc_dev *dev; 906 struct nfc_dev *dev;
882 u32 device_idx, target_idx, protocol; 907 u32 device_idx, target_idx, protocol;
883 int rc; 908 int rc;
884 909
885 if (!info->attrs[NFC_ATTR_DEVICE_INDEX 910 if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
886 !info->attrs[NFC_ATTR_TARGET_INDEX 911 !info->attrs[NFC_ATTR_TARGET_INDEX] ||
887 !info->attrs[NFC_ATTR_PROTOCOLS]) 912 !info->attrs[NFC_ATTR_PROTOCOLS])
888 return -EINVAL; 913 return -EINVAL;
889 914
890 device_idx = nla_get_u32(info->attrs[N 915 device_idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
891 916
892 dev = nfc_get_device(device_idx); 917 dev = nfc_get_device(device_idx);
893 if (!dev) 918 if (!dev)
894 return -ENODEV; 919 return -ENODEV;
895 920
896 target_idx = nla_get_u32(info->attrs[N 921 target_idx = nla_get_u32(info->attrs[NFC_ATTR_TARGET_INDEX]);
897 protocol = nla_get_u32(info->attrs[NFC 922 protocol = nla_get_u32(info->attrs[NFC_ATTR_PROTOCOLS]);
898 923
899 nfc_deactivate_target(dev, target_idx, 924 nfc_deactivate_target(dev, target_idx, NFC_TARGET_MODE_SLEEP);
900 rc = nfc_activate_target(dev, target_i 925 rc = nfc_activate_target(dev, target_idx, protocol);
901 926
902 nfc_put_device(dev); 927 nfc_put_device(dev);
903 return rc; 928 return rc;
904 } 929 }
905 930
906 static int nfc_genl_deactivate_target(struct s <<
907 struct g <<
908 { <<
909 struct nfc_dev *dev; <<
910 u32 device_idx, target_idx; <<
911 int rc; <<
912 <<
913 if (!info->attrs[NFC_ATTR_DEVICE_INDEX <<
914 !info->attrs[NFC_ATTR_TARGET_INDEX <<
915 return -EINVAL; <<
916 <<
917 device_idx = nla_get_u32(info->attrs[N <<
918 <<
919 dev = nfc_get_device(device_idx); <<
920 if (!dev) <<
921 return -ENODEV; <<
922 <<
923 target_idx = nla_get_u32(info->attrs[N <<
924 <<
925 rc = nfc_deactivate_target(dev, target <<
926 <<
927 nfc_put_device(dev); <<
928 return rc; <<
929 } <<
930 <<
931 static int nfc_genl_dep_link_up(struct sk_buff 931 static int nfc_genl_dep_link_up(struct sk_buff *skb, struct genl_info *info)
932 { 932 {
933 struct nfc_dev *dev; 933 struct nfc_dev *dev;
934 int rc, tgt_idx; 934 int rc, tgt_idx;
935 u32 idx; 935 u32 idx;
936 u8 comm; 936 u8 comm;
937 937
938 pr_debug("DEP link up\n"); 938 pr_debug("DEP link up\n");
939 939
940 if (!info->attrs[NFC_ATTR_DEVICE_INDEX 940 if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
941 !info->attrs[NFC_ATTR_COMM_MODE]) 941 !info->attrs[NFC_ATTR_COMM_MODE])
942 return -EINVAL; 942 return -EINVAL;
943 943
944 idx = nla_get_u32(info->attrs[NFC_ATTR 944 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
945 if (!info->attrs[NFC_ATTR_TARGET_INDEX 945 if (!info->attrs[NFC_ATTR_TARGET_INDEX])
946 tgt_idx = NFC_TARGET_IDX_ANY; 946 tgt_idx = NFC_TARGET_IDX_ANY;
947 else 947 else
948 tgt_idx = nla_get_u32(info->at 948 tgt_idx = nla_get_u32(info->attrs[NFC_ATTR_TARGET_INDEX]);
949 949
950 comm = nla_get_u8(info->attrs[NFC_ATTR 950 comm = nla_get_u8(info->attrs[NFC_ATTR_COMM_MODE]);
951 951
952 if (comm != NFC_COMM_ACTIVE && comm != 952 if (comm != NFC_COMM_ACTIVE && comm != NFC_COMM_PASSIVE)
953 return -EINVAL; 953 return -EINVAL;
954 954
955 dev = nfc_get_device(idx); 955 dev = nfc_get_device(idx);
956 if (!dev) 956 if (!dev)
957 return -ENODEV; 957 return -ENODEV;
958 958
959 rc = nfc_dep_link_up(dev, tgt_idx, com 959 rc = nfc_dep_link_up(dev, tgt_idx, comm);
960 960
961 nfc_put_device(dev); 961 nfc_put_device(dev);
962 962
963 return rc; 963 return rc;
964 } 964 }
965 965
966 static int nfc_genl_dep_link_down(struct sk_bu 966 static int nfc_genl_dep_link_down(struct sk_buff *skb, struct genl_info *info)
967 { 967 {
968 struct nfc_dev *dev; 968 struct nfc_dev *dev;
969 int rc; 969 int rc;
970 u32 idx; 970 u32 idx;
971 971
972 if (!info->attrs[NFC_ATTR_DEVICE_INDEX 972 if (!info->attrs[NFC_ATTR_DEVICE_INDEX])
973 return -EINVAL; 973 return -EINVAL;
974 974
975 idx = nla_get_u32(info->attrs[NFC_ATTR 975 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
976 976
977 dev = nfc_get_device(idx); 977 dev = nfc_get_device(idx);
978 if (!dev) 978 if (!dev)
979 return -ENODEV; 979 return -ENODEV;
980 980
981 rc = nfc_dep_link_down(dev); 981 rc = nfc_dep_link_down(dev);
982 982
983 nfc_put_device(dev); 983 nfc_put_device(dev);
984 return rc; 984 return rc;
985 } 985 }
986 986
987 static int nfc_genl_send_params(struct sk_buff 987 static int nfc_genl_send_params(struct sk_buff *msg,
988 struct nfc_llc 988 struct nfc_llcp_local *local,
989 u32 portid, u3 989 u32 portid, u32 seq)
990 { 990 {
991 void *hdr; 991 void *hdr;
992 992
993 hdr = genlmsg_put(msg, portid, seq, &n 993 hdr = genlmsg_put(msg, portid, seq, &nfc_genl_family, 0,
994 NFC_CMD_LLC_GET_PARA 994 NFC_CMD_LLC_GET_PARAMS);
995 if (!hdr) 995 if (!hdr)
996 return -EMSGSIZE; 996 return -EMSGSIZE;
997 997
998 if (nla_put_u32(msg, NFC_ATTR_DEVICE_I 998 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, local->dev->idx) ||
999 nla_put_u8(msg, NFC_ATTR_LLC_PARAM 999 nla_put_u8(msg, NFC_ATTR_LLC_PARAM_LTO, local->lto) ||
1000 nla_put_u8(msg, NFC_ATTR_LLC_PARA 1000 nla_put_u8(msg, NFC_ATTR_LLC_PARAM_RW, local->rw) ||
1001 nla_put_u16(msg, NFC_ATTR_LLC_PAR 1001 nla_put_u16(msg, NFC_ATTR_LLC_PARAM_MIUX, be16_to_cpu(local->miux)))
1002 goto nla_put_failure; 1002 goto nla_put_failure;
1003 1003
1004 genlmsg_end(msg, hdr); 1004 genlmsg_end(msg, hdr);
1005 return 0; 1005 return 0;
1006 1006
1007 nla_put_failure: 1007 nla_put_failure:
>> 1008
1008 genlmsg_cancel(msg, hdr); 1009 genlmsg_cancel(msg, hdr);
1009 return -EMSGSIZE; 1010 return -EMSGSIZE;
1010 } 1011 }
1011 1012
1012 static int nfc_genl_llc_get_params(struct sk_ 1013 static int nfc_genl_llc_get_params(struct sk_buff *skb, struct genl_info *info)
1013 { 1014 {
1014 struct nfc_dev *dev; 1015 struct nfc_dev *dev;
1015 struct nfc_llcp_local *local; 1016 struct nfc_llcp_local *local;
1016 int rc = 0; 1017 int rc = 0;
1017 struct sk_buff *msg = NULL; 1018 struct sk_buff *msg = NULL;
1018 u32 idx; 1019 u32 idx;
1019 1020
1020 if (!info->attrs[NFC_ATTR_DEVICE_INDE 1021 if (!info->attrs[NFC_ATTR_DEVICE_INDEX])
1021 return -EINVAL; 1022 return -EINVAL;
1022 1023
1023 idx = nla_get_u32(info->attrs[NFC_ATT 1024 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
1024 1025
1025 dev = nfc_get_device(idx); 1026 dev = nfc_get_device(idx);
1026 if (!dev) 1027 if (!dev)
1027 return -ENODEV; 1028 return -ENODEV;
1028 1029
1029 device_lock(&dev->dev); 1030 device_lock(&dev->dev);
1030 1031
1031 local = nfc_llcp_find_local(dev); 1032 local = nfc_llcp_find_local(dev);
1032 if (!local) { 1033 if (!local) {
1033 rc = -ENODEV; 1034 rc = -ENODEV;
1034 goto exit; 1035 goto exit;
1035 } 1036 }
1036 1037
1037 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, G 1038 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
1038 if (!msg) { 1039 if (!msg) {
1039 rc = -ENOMEM; 1040 rc = -ENOMEM;
1040 goto put_local; !! 1041 goto exit;
1041 } 1042 }
1042 1043
1043 rc = nfc_genl_send_params(msg, local, 1044 rc = nfc_genl_send_params(msg, local, info->snd_portid, info->snd_seq);
1044 1045
1045 put_local: <<
1046 nfc_llcp_local_put(local); <<
1047 <<
1048 exit: 1046 exit:
1049 device_unlock(&dev->dev); 1047 device_unlock(&dev->dev);
1050 1048
1051 nfc_put_device(dev); 1049 nfc_put_device(dev);
1052 1050
1053 if (rc < 0) { 1051 if (rc < 0) {
1054 if (msg) 1052 if (msg)
1055 nlmsg_free(msg); 1053 nlmsg_free(msg);
1056 1054
1057 return rc; 1055 return rc;
1058 } 1056 }
1059 1057
1060 return genlmsg_reply(msg, info); 1058 return genlmsg_reply(msg, info);
1061 } 1059 }
1062 1060
1063 static int nfc_genl_llc_set_params(struct sk_ 1061 static int nfc_genl_llc_set_params(struct sk_buff *skb, struct genl_info *info)
1064 { 1062 {
1065 struct nfc_dev *dev; 1063 struct nfc_dev *dev;
1066 struct nfc_llcp_local *local; 1064 struct nfc_llcp_local *local;
1067 u8 rw = 0; 1065 u8 rw = 0;
1068 u16 miux = 0; 1066 u16 miux = 0;
1069 u32 idx; 1067 u32 idx;
1070 int rc = 0; 1068 int rc = 0;
1071 1069
1072 if (!info->attrs[NFC_ATTR_DEVICE_INDE 1070 if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
1073 (!info->attrs[NFC_ATTR_LLC_PARAM_ 1071 (!info->attrs[NFC_ATTR_LLC_PARAM_LTO] &&
1074 !info->attrs[NFC_ATTR_LLC_PARAM_ 1072 !info->attrs[NFC_ATTR_LLC_PARAM_RW] &&
1075 !info->attrs[NFC_ATTR_LLC_PARAM_ 1073 !info->attrs[NFC_ATTR_LLC_PARAM_MIUX]))
1076 return -EINVAL; 1074 return -EINVAL;
1077 1075
1078 if (info->attrs[NFC_ATTR_LLC_PARAM_RW 1076 if (info->attrs[NFC_ATTR_LLC_PARAM_RW]) {
1079 rw = nla_get_u8(info->attrs[N 1077 rw = nla_get_u8(info->attrs[NFC_ATTR_LLC_PARAM_RW]);
1080 1078
1081 if (rw > LLCP_MAX_RW) 1079 if (rw > LLCP_MAX_RW)
1082 return -EINVAL; 1080 return -EINVAL;
1083 } 1081 }
1084 1082
1085 if (info->attrs[NFC_ATTR_LLC_PARAM_MI 1083 if (info->attrs[NFC_ATTR_LLC_PARAM_MIUX]) {
1086 miux = nla_get_u16(info->attr 1084 miux = nla_get_u16(info->attrs[NFC_ATTR_LLC_PARAM_MIUX]);
1087 1085
1088 if (miux > LLCP_MAX_MIUX) 1086 if (miux > LLCP_MAX_MIUX)
1089 return -EINVAL; 1087 return -EINVAL;
1090 } 1088 }
1091 1089
1092 idx = nla_get_u32(info->attrs[NFC_ATT 1090 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
1093 1091
1094 dev = nfc_get_device(idx); 1092 dev = nfc_get_device(idx);
1095 if (!dev) 1093 if (!dev)
1096 return -ENODEV; 1094 return -ENODEV;
1097 1095
1098 device_lock(&dev->dev); 1096 device_lock(&dev->dev);
1099 1097
1100 local = nfc_llcp_find_local(dev); 1098 local = nfc_llcp_find_local(dev);
1101 if (!local) { 1099 if (!local) {
>> 1100 nfc_put_device(dev);
1102 rc = -ENODEV; 1101 rc = -ENODEV;
1103 goto exit; 1102 goto exit;
1104 } 1103 }
1105 1104
1106 if (info->attrs[NFC_ATTR_LLC_PARAM_LT 1105 if (info->attrs[NFC_ATTR_LLC_PARAM_LTO]) {
1107 if (dev->dep_link_up) { 1106 if (dev->dep_link_up) {
1108 rc = -EINPROGRESS; 1107 rc = -EINPROGRESS;
1109 goto put_local; !! 1108 goto exit;
1110 } 1109 }
1111 1110
1112 local->lto = nla_get_u8(info- 1111 local->lto = nla_get_u8(info->attrs[NFC_ATTR_LLC_PARAM_LTO]);
1113 } 1112 }
1114 1113
1115 if (info->attrs[NFC_ATTR_LLC_PARAM_RW 1114 if (info->attrs[NFC_ATTR_LLC_PARAM_RW])
1116 local->rw = rw; 1115 local->rw = rw;
1117 1116
1118 if (info->attrs[NFC_ATTR_LLC_PARAM_MI 1117 if (info->attrs[NFC_ATTR_LLC_PARAM_MIUX])
1119 local->miux = cpu_to_be16(miu 1118 local->miux = cpu_to_be16(miux);
1120 1119
1121 put_local: <<
1122 nfc_llcp_local_put(local); <<
1123 <<
1124 exit: 1120 exit:
1125 device_unlock(&dev->dev); 1121 device_unlock(&dev->dev);
1126 1122
1127 nfc_put_device(dev); 1123 nfc_put_device(dev);
1128 1124
1129 return rc; 1125 return rc;
1130 } 1126 }
1131 1127
1132 static int nfc_genl_llc_sdreq(struct sk_buff 1128 static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info)
1133 { 1129 {
1134 struct nfc_dev *dev; 1130 struct nfc_dev *dev;
1135 struct nfc_llcp_local *local; 1131 struct nfc_llcp_local *local;
1136 struct nlattr *attr, *sdp_attrs[NFC_S 1132 struct nlattr *attr, *sdp_attrs[NFC_SDP_ATTR_MAX+1];
1137 u32 idx; 1133 u32 idx;
1138 u8 tid; 1134 u8 tid;
1139 char *uri; 1135 char *uri;
1140 int rc = 0, rem; 1136 int rc = 0, rem;
1141 size_t uri_len, tlvs_len; 1137 size_t uri_len, tlvs_len;
1142 struct hlist_head sdreq_list; 1138 struct hlist_head sdreq_list;
1143 struct nfc_llcp_sdp_tlv *sdreq; 1139 struct nfc_llcp_sdp_tlv *sdreq;
1144 1140
1145 if (!info->attrs[NFC_ATTR_DEVICE_INDE 1141 if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
1146 !info->attrs[NFC_ATTR_LLC_SDP]) 1142 !info->attrs[NFC_ATTR_LLC_SDP])
1147 return -EINVAL; 1143 return -EINVAL;
1148 1144
1149 idx = nla_get_u32(info->attrs[NFC_ATT 1145 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
1150 1146
1151 dev = nfc_get_device(idx); 1147 dev = nfc_get_device(idx);
1152 if (!dev) 1148 if (!dev)
1153 return -ENODEV; 1149 return -ENODEV;
1154 1150
1155 device_lock(&dev->dev); 1151 device_lock(&dev->dev);
1156 1152
1157 if (dev->dep_link_up == false) { 1153 if (dev->dep_link_up == false) {
1158 rc = -ENOLINK; 1154 rc = -ENOLINK;
1159 goto exit; 1155 goto exit;
1160 } 1156 }
1161 1157
1162 local = nfc_llcp_find_local(dev); 1158 local = nfc_llcp_find_local(dev);
1163 if (!local) { 1159 if (!local) {
>> 1160 nfc_put_device(dev);
1164 rc = -ENODEV; 1161 rc = -ENODEV;
1165 goto exit; 1162 goto exit;
1166 } 1163 }
1167 1164
1168 INIT_HLIST_HEAD(&sdreq_list); 1165 INIT_HLIST_HEAD(&sdreq_list);
1169 1166
1170 tlvs_len = 0; 1167 tlvs_len = 0;
1171 1168
1172 nla_for_each_nested(attr, info->attrs 1169 nla_for_each_nested(attr, info->attrs[NFC_ATTR_LLC_SDP], rem) {
1173 rc = nla_parse_nested_depreca !! 1170 rc = nla_parse_nested(sdp_attrs, NFC_SDP_ATTR_MAX, attr,
1174 !! 1171 nfc_sdp_genl_policy, info->extack);
1175 <<
1176 1172
1177 if (rc != 0) { 1173 if (rc != 0) {
1178 rc = -EINVAL; 1174 rc = -EINVAL;
1179 goto put_local; !! 1175 goto exit;
1180 } 1176 }
1181 1177
1182 if (!sdp_attrs[NFC_SDP_ATTR_U 1178 if (!sdp_attrs[NFC_SDP_ATTR_URI])
1183 continue; 1179 continue;
1184 1180
1185 uri_len = nla_len(sdp_attrs[N 1181 uri_len = nla_len(sdp_attrs[NFC_SDP_ATTR_URI]);
1186 if (uri_len == 0) 1182 if (uri_len == 0)
1187 continue; 1183 continue;
1188 1184
1189 uri = nla_data(sdp_attrs[NFC_ 1185 uri = nla_data(sdp_attrs[NFC_SDP_ATTR_URI]);
1190 if (uri == NULL || *uri == 0) 1186 if (uri == NULL || *uri == 0)
1191 continue; 1187 continue;
1192 1188
1193 tid = local->sdreq_next_tid++ 1189 tid = local->sdreq_next_tid++;
1194 1190
1195 sdreq = nfc_llcp_build_sdreq_ 1191 sdreq = nfc_llcp_build_sdreq_tlv(tid, uri, uri_len);
1196 if (sdreq == NULL) { 1192 if (sdreq == NULL) {
1197 rc = -ENOMEM; 1193 rc = -ENOMEM;
1198 goto put_local; !! 1194 goto exit;
1199 } 1195 }
1200 1196
1201 tlvs_len += sdreq->tlv_len; 1197 tlvs_len += sdreq->tlv_len;
1202 1198
1203 hlist_add_head(&sdreq->node, 1199 hlist_add_head(&sdreq->node, &sdreq_list);
1204 } 1200 }
1205 1201
1206 if (hlist_empty(&sdreq_list)) { 1202 if (hlist_empty(&sdreq_list)) {
1207 rc = -EINVAL; 1203 rc = -EINVAL;
1208 goto put_local; !! 1204 goto exit;
1209 } 1205 }
1210 1206
1211 rc = nfc_llcp_send_snl_sdreq(local, & 1207 rc = nfc_llcp_send_snl_sdreq(local, &sdreq_list, tlvs_len);
1212 <<
1213 put_local: <<
1214 nfc_llcp_local_put(local); <<
1215 <<
1216 exit: 1208 exit:
1217 device_unlock(&dev->dev); 1209 device_unlock(&dev->dev);
1218 1210
1219 nfc_put_device(dev); 1211 nfc_put_device(dev);
1220 1212
1221 return rc; 1213 return rc;
1222 } 1214 }
1223 1215
1224 static int nfc_genl_fw_download(struct sk_buf 1216 static int nfc_genl_fw_download(struct sk_buff *skb, struct genl_info *info)
1225 { 1217 {
1226 struct nfc_dev *dev; 1218 struct nfc_dev *dev;
1227 int rc; 1219 int rc;
1228 u32 idx; 1220 u32 idx;
1229 char firmware_name[NFC_FIRMWARE_NAME_ 1221 char firmware_name[NFC_FIRMWARE_NAME_MAXSIZE + 1];
1230 1222
1231 if (!info->attrs[NFC_ATTR_DEVICE_INDE !! 1223 if (!info->attrs[NFC_ATTR_DEVICE_INDEX])
1232 return -EINVAL; 1224 return -EINVAL;
1233 1225
1234 idx = nla_get_u32(info->attrs[NFC_ATT 1226 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
1235 1227
1236 dev = nfc_get_device(idx); 1228 dev = nfc_get_device(idx);
1237 if (!dev) 1229 if (!dev)
1238 return -ENODEV; 1230 return -ENODEV;
1239 1231
1240 nla_strscpy(firmware_name, info->attr !! 1232 nla_strlcpy(firmware_name, info->attrs[NFC_ATTR_FIRMWARE_NAME],
1241 sizeof(firmware_name)); 1233 sizeof(firmware_name));
1242 1234
1243 rc = nfc_fw_download(dev, firmware_na 1235 rc = nfc_fw_download(dev, firmware_name);
1244 1236
1245 nfc_put_device(dev); 1237 nfc_put_device(dev);
1246 return rc; 1238 return rc;
1247 } 1239 }
1248 1240
1249 int nfc_genl_fw_download_done(struct nfc_dev 1241 int nfc_genl_fw_download_done(struct nfc_dev *dev, const char *firmware_name,
1250 u32 result) 1242 u32 result)
1251 { 1243 {
1252 struct sk_buff *msg; 1244 struct sk_buff *msg;
1253 void *hdr; 1245 void *hdr;
1254 1246
1255 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, G !! 1247 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
1256 if (!msg) 1248 if (!msg)
1257 return -ENOMEM; 1249 return -ENOMEM;
1258 1250
1259 hdr = genlmsg_put(msg, 0, 0, &nfc_gen 1251 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
1260 NFC_CMD_FW_DOWNLOAD 1252 NFC_CMD_FW_DOWNLOAD);
1261 if (!hdr) 1253 if (!hdr)
1262 goto free_msg; 1254 goto free_msg;
1263 1255
1264 if (nla_put_string(msg, NFC_ATTR_FIRM 1256 if (nla_put_string(msg, NFC_ATTR_FIRMWARE_NAME, firmware_name) ||
1265 nla_put_u32(msg, NFC_ATTR_FIRMWAR 1257 nla_put_u32(msg, NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS, result) ||
1266 nla_put_u32(msg, NFC_ATTR_DEVICE_ 1258 nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx))
1267 goto nla_put_failure; 1259 goto nla_put_failure;
1268 1260
1269 genlmsg_end(msg, hdr); 1261 genlmsg_end(msg, hdr);
1270 1262
1271 genlmsg_multicast(&nfc_genl_family, m !! 1263 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_KERNEL);
1272 1264
1273 return 0; 1265 return 0;
1274 1266
1275 nla_put_failure: 1267 nla_put_failure:
>> 1268 genlmsg_cancel(msg, hdr);
1276 free_msg: 1269 free_msg:
1277 nlmsg_free(msg); 1270 nlmsg_free(msg);
1278 return -EMSGSIZE; 1271 return -EMSGSIZE;
1279 } 1272 }
1280 1273
1281 static int nfc_genl_enable_se(struct sk_buff 1274 static int nfc_genl_enable_se(struct sk_buff *skb, struct genl_info *info)
1282 { 1275 {
1283 struct nfc_dev *dev; 1276 struct nfc_dev *dev;
1284 int rc; 1277 int rc;
1285 u32 idx, se_idx; 1278 u32 idx, se_idx;
1286 1279
1287 if (!info->attrs[NFC_ATTR_DEVICE_INDE 1280 if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
1288 !info->attrs[NFC_ATTR_SE_INDEX]) 1281 !info->attrs[NFC_ATTR_SE_INDEX])
1289 return -EINVAL; 1282 return -EINVAL;
1290 1283
1291 idx = nla_get_u32(info->attrs[NFC_ATT 1284 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
1292 se_idx = nla_get_u32(info->attrs[NFC_ 1285 se_idx = nla_get_u32(info->attrs[NFC_ATTR_SE_INDEX]);
1293 1286
1294 dev = nfc_get_device(idx); 1287 dev = nfc_get_device(idx);
1295 if (!dev) 1288 if (!dev)
1296 return -ENODEV; 1289 return -ENODEV;
1297 1290
1298 rc = nfc_enable_se(dev, se_idx); 1291 rc = nfc_enable_se(dev, se_idx);
1299 1292
1300 nfc_put_device(dev); 1293 nfc_put_device(dev);
1301 return rc; 1294 return rc;
1302 } 1295 }
1303 1296
1304 static int nfc_genl_disable_se(struct sk_buff 1297 static int nfc_genl_disable_se(struct sk_buff *skb, struct genl_info *info)
1305 { 1298 {
1306 struct nfc_dev *dev; 1299 struct nfc_dev *dev;
1307 int rc; 1300 int rc;
1308 u32 idx, se_idx; 1301 u32 idx, se_idx;
1309 1302
1310 if (!info->attrs[NFC_ATTR_DEVICE_INDE 1303 if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
1311 !info->attrs[NFC_ATTR_SE_INDEX]) 1304 !info->attrs[NFC_ATTR_SE_INDEX])
1312 return -EINVAL; 1305 return -EINVAL;
1313 1306
1314 idx = nla_get_u32(info->attrs[NFC_ATT 1307 idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
1315 se_idx = nla_get_u32(info->attrs[NFC_ 1308 se_idx = nla_get_u32(info->attrs[NFC_ATTR_SE_INDEX]);
1316 1309
1317 dev = nfc_get_device(idx); 1310 dev = nfc_get_device(idx);
1318 if (!dev) 1311 if (!dev)
1319 return -ENODEV; 1312 return -ENODEV;
1320 1313
1321 rc = nfc_disable_se(dev, se_idx); 1314 rc = nfc_disable_se(dev, se_idx);
1322 1315
1323 nfc_put_device(dev); 1316 nfc_put_device(dev);
1324 return rc; 1317 return rc;
1325 } 1318 }
1326 1319
1327 static int nfc_genl_send_se(struct sk_buff *m 1320 static int nfc_genl_send_se(struct sk_buff *msg, struct nfc_dev *dev,
1328 u32 portid, u 1321 u32 portid, u32 seq,
1329 struct netlin 1322 struct netlink_callback *cb,
1330 int flags) 1323 int flags)
1331 { 1324 {
1332 void *hdr; 1325 void *hdr;
1333 struct nfc_se *se, *n; 1326 struct nfc_se *se, *n;
1334 1327
1335 list_for_each_entry_safe(se, n, &dev- 1328 list_for_each_entry_safe(se, n, &dev->secure_elements, list) {
1336 hdr = genlmsg_put(msg, portid 1329 hdr = genlmsg_put(msg, portid, seq, &nfc_genl_family, flags,
1337 NFC_CMD_GET 1330 NFC_CMD_GET_SE);
1338 if (!hdr) 1331 if (!hdr)
1339 goto nla_put_failure; 1332 goto nla_put_failure;
1340 1333
1341 if (cb) 1334 if (cb)
1342 genl_dump_check_consi !! 1335 genl_dump_check_consistent(cb, hdr, &nfc_genl_family);
1343 1336
1344 if (nla_put_u32(msg, NFC_ATTR 1337 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) ||
1345 nla_put_u32(msg, NFC_ATTR 1338 nla_put_u32(msg, NFC_ATTR_SE_INDEX, se->idx) ||
1346 nla_put_u8(msg, NFC_ATTR_ 1339 nla_put_u8(msg, NFC_ATTR_SE_TYPE, se->type))
1347 goto nla_put_failure; 1340 goto nla_put_failure;
1348 1341
1349 genlmsg_end(msg, hdr); 1342 genlmsg_end(msg, hdr);
1350 } 1343 }
1351 1344
1352 return 0; 1345 return 0;
1353 1346
1354 nla_put_failure: 1347 nla_put_failure:
1355 genlmsg_cancel(msg, hdr); 1348 genlmsg_cancel(msg, hdr);
1356 return -EMSGSIZE; 1349 return -EMSGSIZE;
1357 } 1350 }
1358 1351
1359 static int nfc_genl_dump_ses(struct sk_buff * 1352 static int nfc_genl_dump_ses(struct sk_buff *skb,
1360 struct netli 1353 struct netlink_callback *cb)
1361 { 1354 {
1362 struct class_dev_iter *iter = (struct 1355 struct class_dev_iter *iter = (struct class_dev_iter *) cb->args[0];
1363 struct nfc_dev *dev = (struct nfc_dev 1356 struct nfc_dev *dev = (struct nfc_dev *) cb->args[1];
1364 bool first_call = false; 1357 bool first_call = false;
1365 1358
1366 if (!iter) { 1359 if (!iter) {
1367 first_call = true; 1360 first_call = true;
1368 iter = kmalloc(sizeof(struct 1361 iter = kmalloc(sizeof(struct class_dev_iter), GFP_KERNEL);
1369 if (!iter) 1362 if (!iter)
1370 return -ENOMEM; 1363 return -ENOMEM;
1371 cb->args[0] = (long) iter; 1364 cb->args[0] = (long) iter;
1372 } 1365 }
1373 1366
1374 mutex_lock(&nfc_devlist_mutex); 1367 mutex_lock(&nfc_devlist_mutex);
1375 1368
1376 cb->seq = nfc_devlist_generation; 1369 cb->seq = nfc_devlist_generation;
1377 1370
1378 if (first_call) { 1371 if (first_call) {
1379 nfc_device_iter_init(iter); 1372 nfc_device_iter_init(iter);
1380 dev = nfc_device_iter_next(it 1373 dev = nfc_device_iter_next(iter);
1381 } 1374 }
1382 1375
1383 while (dev) { 1376 while (dev) {
1384 int rc; 1377 int rc;
1385 1378
1386 rc = nfc_genl_send_se(skb, de 1379 rc = nfc_genl_send_se(skb, dev, NETLINK_CB(cb->skb).portid,
1387 cb- 1380 cb->nlh->nlmsg_seq, cb, NLM_F_MULTI);
1388 if (rc < 0) 1381 if (rc < 0)
1389 break; 1382 break;
1390 1383
1391 dev = nfc_device_iter_next(it 1384 dev = nfc_device_iter_next(iter);
1392 } 1385 }
1393 1386
1394 mutex_unlock(&nfc_devlist_mutex); 1387 mutex_unlock(&nfc_devlist_mutex);
1395 1388
1396 cb->args[1] = (long) dev; 1389 cb->args[1] = (long) dev;
1397 1390
1398 return skb->len; 1391 return skb->len;
1399 } 1392 }
1400 1393
1401 static int nfc_genl_dump_ses_done(struct netl 1394 static int nfc_genl_dump_ses_done(struct netlink_callback *cb)
1402 { 1395 {
1403 struct class_dev_iter *iter = (struct 1396 struct class_dev_iter *iter = (struct class_dev_iter *) cb->args[0];
1404 1397
1405 if (iter) { !! 1398 nfc_device_iter_exit(iter);
1406 nfc_device_iter_exit(iter); !! 1399 kfree(iter);
1407 kfree(iter); <<
1408 } <<
1409 1400
1410 return 0; 1401 return 0;
1411 } 1402 }
1412 1403
1413 static int nfc_se_io(struct nfc_dev *dev, u32 1404 static int nfc_se_io(struct nfc_dev *dev, u32 se_idx,
1414 u8 *apdu, size_t apdu_le 1405 u8 *apdu, size_t apdu_length,
1415 se_io_cb_t cb, void *cb_ 1406 se_io_cb_t cb, void *cb_context)
1416 { 1407 {
1417 struct nfc_se *se; 1408 struct nfc_se *se;
1418 int rc; 1409 int rc;
1419 1410
1420 pr_debug("%s se index %d\n", dev_name 1411 pr_debug("%s se index %d\n", dev_name(&dev->dev), se_idx);
1421 1412
1422 device_lock(&dev->dev); 1413 device_lock(&dev->dev);
1423 1414
1424 if (!device_is_registered(&dev->dev)) 1415 if (!device_is_registered(&dev->dev)) {
1425 rc = -ENODEV; 1416 rc = -ENODEV;
1426 goto error; 1417 goto error;
1427 } 1418 }
1428 1419
1429 if (!dev->dev_up) { 1420 if (!dev->dev_up) {
1430 rc = -ENODEV; 1421 rc = -ENODEV;
1431 goto error; 1422 goto error;
1432 } 1423 }
1433 1424
1434 if (!dev->ops->se_io) { 1425 if (!dev->ops->se_io) {
1435 rc = -EOPNOTSUPP; 1426 rc = -EOPNOTSUPP;
1436 goto error; 1427 goto error;
1437 } 1428 }
1438 1429
1439 se = nfc_find_se(dev, se_idx); 1430 se = nfc_find_se(dev, se_idx);
1440 if (!se) { 1431 if (!se) {
1441 rc = -EINVAL; 1432 rc = -EINVAL;
1442 goto error; 1433 goto error;
1443 } 1434 }
1444 1435
1445 if (se->state != NFC_SE_ENABLED) { 1436 if (se->state != NFC_SE_ENABLED) {
1446 rc = -ENODEV; 1437 rc = -ENODEV;
1447 goto error; 1438 goto error;
1448 } 1439 }
1449 1440
1450 rc = dev->ops->se_io(dev, se_idx, apd 1441 rc = dev->ops->se_io(dev, se_idx, apdu,
1451 apdu_length, cb, cb_c 1442 apdu_length, cb, cb_context);
1452 1443
1453 device_unlock(&dev->dev); <<
1454 return rc; <<
1455 <<
1456 error: 1444 error:
1457 device_unlock(&dev->dev); 1445 device_unlock(&dev->dev);
1458 kfree(cb_context); <<
1459 return rc; 1446 return rc;
1460 } 1447 }
1461 1448
1462 struct se_io_ctx { 1449 struct se_io_ctx {
1463 u32 dev_idx; 1450 u32 dev_idx;
1464 u32 se_idx; 1451 u32 se_idx;
1465 }; 1452 };
1466 1453
1467 static void se_io_cb(void *context, u8 *apdu, 1454 static void se_io_cb(void *context, u8 *apdu, size_t apdu_len, int err)
1468 { 1455 {
1469 struct se_io_ctx *ctx = context; 1456 struct se_io_ctx *ctx = context;
1470 struct sk_buff *msg; 1457 struct sk_buff *msg;
1471 void *hdr; 1458 void *hdr;
1472 1459
1473 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, G 1460 msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
1474 if (!msg) { 1461 if (!msg) {
1475 kfree(ctx); 1462 kfree(ctx);
1476 return; 1463 return;
1477 } 1464 }
1478 1465
1479 hdr = genlmsg_put(msg, 0, 0, &nfc_gen 1466 hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
1480 NFC_CMD_SE_IO); 1467 NFC_CMD_SE_IO);
1481 if (!hdr) 1468 if (!hdr)
1482 goto free_msg; 1469 goto free_msg;
1483 1470
1484 if (nla_put_u32(msg, NFC_ATTR_DEVICE_ 1471 if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, ctx->dev_idx) ||
1485 nla_put_u32(msg, NFC_ATTR_SE_INDE 1472 nla_put_u32(msg, NFC_ATTR_SE_INDEX, ctx->se_idx) ||
1486 nla_put(msg, NFC_ATTR_SE_APDU, ap 1473 nla_put(msg, NFC_ATTR_SE_APDU, apdu_len, apdu))
1487 goto nla_put_failure; 1474 goto nla_put_failure;
1488 1475
1489 genlmsg_end(msg, hdr); 1476 genlmsg_end(msg, hdr);
1490 1477
1491 genlmsg_multicast(&nfc_genl_family, m 1478 genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_KERNEL);
1492 1479
1493 kfree(ctx); 1480 kfree(ctx);
1494 1481
1495 return; 1482 return;
1496 1483
1497 nla_put_failure: 1484 nla_put_failure:
>> 1485 genlmsg_cancel(msg, hdr);
1498 free_msg: 1486 free_msg:
1499 nlmsg_free(msg); 1487 nlmsg_free(msg);
1500 kfree(ctx); 1488 kfree(ctx);
1501 1489
1502 return; 1490 return;
1503 } 1491 }
1504 1492
1505 static int nfc_genl_se_io(struct sk_buff *skb 1493 static int nfc_genl_se_io(struct sk_buff *skb, struct genl_info *info)
1506 { 1494 {
1507 struct nfc_dev *dev; 1495 struct nfc_dev *dev;
1508 struct se_io_ctx *ctx; 1496 struct se_io_ctx *ctx;
1509 u32 dev_idx, se_idx; 1497 u32 dev_idx, se_idx;
1510 u8 *apdu; 1498 u8 *apdu;
1511 size_t apdu_len; 1499 size_t apdu_len;
1512 int rc; <<
1513 1500
1514 if (!info->attrs[NFC_ATTR_DEVICE_INDE 1501 if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
1515 !info->attrs[NFC_ATTR_SE_INDEX] | 1502 !info->attrs[NFC_ATTR_SE_INDEX] ||
1516 !info->attrs[NFC_ATTR_SE_APDU]) 1503 !info->attrs[NFC_ATTR_SE_APDU])
1517 return -EINVAL; 1504 return -EINVAL;
1518 1505
1519 dev_idx = nla_get_u32(info->attrs[NFC 1506 dev_idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
1520 se_idx = nla_get_u32(info->attrs[NFC_ 1507 se_idx = nla_get_u32(info->attrs[NFC_ATTR_SE_INDEX]);
1521 1508
1522 dev = nfc_get_device(dev_idx); 1509 dev = nfc_get_device(dev_idx);
1523 if (!dev) 1510 if (!dev)
1524 return -ENODEV; 1511 return -ENODEV;
1525 1512
1526 if (!dev->ops || !dev->ops->se_io) { !! 1513 if (!dev->ops || !dev->ops->se_io)
1527 rc = -EOPNOTSUPP; !! 1514 return -ENOTSUPP;
1528 goto put_dev; <<
1529 } <<
1530 1515
1531 apdu_len = nla_len(info->attrs[NFC_AT 1516 apdu_len = nla_len(info->attrs[NFC_ATTR_SE_APDU]);
1532 if (apdu_len == 0) { !! 1517 if (apdu_len == 0)
1533 rc = -EINVAL; !! 1518 return -EINVAL;
1534 goto put_dev; <<
1535 } <<
1536 1519
1537 apdu = nla_data(info->attrs[NFC_ATTR_ 1520 apdu = nla_data(info->attrs[NFC_ATTR_SE_APDU]);
1538 if (!apdu) { !! 1521 if (!apdu)
1539 rc = -EINVAL; !! 1522 return -EINVAL;
1540 goto put_dev; <<
1541 } <<
1542 1523
1543 ctx = kzalloc(sizeof(struct se_io_ctx 1524 ctx = kzalloc(sizeof(struct se_io_ctx), GFP_KERNEL);
1544 if (!ctx) { !! 1525 if (!ctx)
1545 rc = -ENOMEM; !! 1526 return -ENOMEM;
1546 goto put_dev; <<
1547 } <<
1548 1527
1549 ctx->dev_idx = dev_idx; 1528 ctx->dev_idx = dev_idx;
1550 ctx->se_idx = se_idx; 1529 ctx->se_idx = se_idx;
1551 1530
1552 rc = nfc_se_io(dev, se_idx, apdu, apd !! 1531 return nfc_se_io(dev, se_idx, apdu, apdu_len, se_io_cb, ctx);
1553 <<
1554 put_dev: <<
1555 nfc_put_device(dev); <<
1556 return rc; <<
1557 } 1532 }
1558 1533
1559 static int nfc_genl_vendor_cmd(struct sk_buff 1534 static int nfc_genl_vendor_cmd(struct sk_buff *skb,
1560 struct genl_in 1535 struct genl_info *info)
1561 { 1536 {
1562 struct nfc_dev *dev; 1537 struct nfc_dev *dev;
1563 const struct nfc_vendor_cmd *cmd; !! 1538 struct nfc_vendor_cmd *cmd;
1564 u32 dev_idx, vid, subcmd; 1539 u32 dev_idx, vid, subcmd;
1565 u8 *data; 1540 u8 *data;
1566 size_t data_len; 1541 size_t data_len;
1567 int i, err; 1542 int i, err;
1568 1543
1569 if (!info->attrs[NFC_ATTR_DEVICE_INDE 1544 if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
1570 !info->attrs[NFC_ATTR_VENDOR_ID] 1545 !info->attrs[NFC_ATTR_VENDOR_ID] ||
1571 !info->attrs[NFC_ATTR_VENDOR_SUBC 1546 !info->attrs[NFC_ATTR_VENDOR_SUBCMD])
1572 return -EINVAL; 1547 return -EINVAL;
1573 1548
1574 dev_idx = nla_get_u32(info->attrs[NFC 1549 dev_idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
1575 vid = nla_get_u32(info->attrs[NFC_ATT 1550 vid = nla_get_u32(info->attrs[NFC_ATTR_VENDOR_ID]);
1576 subcmd = nla_get_u32(info->attrs[NFC_ 1551 subcmd = nla_get_u32(info->attrs[NFC_ATTR_VENDOR_SUBCMD]);
1577 1552
1578 dev = nfc_get_device(dev_idx); 1553 dev = nfc_get_device(dev_idx);
1579 if (!dev) !! 1554 if (!dev || !dev->vendor_cmds || !dev->n_vendor_cmds)
1580 return -ENODEV; 1555 return -ENODEV;
1581 1556
1582 if (!dev->vendor_cmds || !dev->n_vend <<
1583 err = -ENODEV; <<
1584 goto put_dev; <<
1585 } <<
1586 <<
1587 if (info->attrs[NFC_ATTR_VENDOR_DATA] 1557 if (info->attrs[NFC_ATTR_VENDOR_DATA]) {
1588 data = nla_data(info->attrs[N 1558 data = nla_data(info->attrs[NFC_ATTR_VENDOR_DATA]);
1589 data_len = nla_len(info->attr 1559 data_len = nla_len(info->attrs[NFC_ATTR_VENDOR_DATA]);
1590 if (data_len == 0) { !! 1560 if (data_len == 0)
1591 err = -EINVAL; !! 1561 return -EINVAL;
1592 goto put_dev; <<
1593 } <<
1594 } else { 1562 } else {
1595 data = NULL; 1563 data = NULL;
1596 data_len = 0; 1564 data_len = 0;
1597 } 1565 }
1598 1566
1599 for (i = 0; i < dev->n_vendor_cmds; i 1567 for (i = 0; i < dev->n_vendor_cmds; i++) {
1600 cmd = &dev->vendor_cmds[i]; 1568 cmd = &dev->vendor_cmds[i];
1601 1569
1602 if (cmd->vendor_id != vid || 1570 if (cmd->vendor_id != vid || cmd->subcmd != subcmd)
1603 continue; 1571 continue;
1604 1572
1605 dev->cur_cmd_info = info; 1573 dev->cur_cmd_info = info;
1606 err = cmd->doit(dev, data, da 1574 err = cmd->doit(dev, data, data_len);
1607 dev->cur_cmd_info = NULL; 1575 dev->cur_cmd_info = NULL;
1608 goto put_dev; !! 1576 return err;
1609 } 1577 }
1610 1578
1611 err = -EOPNOTSUPP; !! 1579 return -EOPNOTSUPP;
1612 <<
1613 put_dev: <<
1614 nfc_put_device(dev); <<
1615 return err; <<
1616 } 1580 }
1617 1581
1618 /* message building helper */ 1582 /* message building helper */
1619 static inline void *nfc_hdr_put(struct sk_buf 1583 static inline void *nfc_hdr_put(struct sk_buff *skb, u32 portid, u32 seq,
1620 int flags, u8 1584 int flags, u8 cmd)
1621 { 1585 {
1622 /* since there is no private header j 1586 /* since there is no private header just add the generic one */
1623 return genlmsg_put(skb, portid, seq, 1587 return genlmsg_put(skb, portid, seq, &nfc_genl_family, flags, cmd);
1624 } 1588 }
1625 1589
1626 static struct sk_buff * 1590 static struct sk_buff *
1627 __nfc_alloc_vendor_cmd_skb(struct nfc_dev *de 1591 __nfc_alloc_vendor_cmd_skb(struct nfc_dev *dev, int approxlen,
1628 u32 portid, u32 se 1592 u32 portid, u32 seq,
1629 enum nfc_attrs att 1593 enum nfc_attrs attr,
1630 u32 oui, u32 subcm 1594 u32 oui, u32 subcmd, gfp_t gfp)
1631 { 1595 {
1632 struct sk_buff *skb; 1596 struct sk_buff *skb;
1633 void *hdr; 1597 void *hdr;
1634 1598
1635 skb = nlmsg_new(approxlen + 100, gfp) 1599 skb = nlmsg_new(approxlen + 100, gfp);
1636 if (!skb) 1600 if (!skb)
1637 return NULL; 1601 return NULL;
1638 1602
1639 hdr = nfc_hdr_put(skb, portid, seq, 0 1603 hdr = nfc_hdr_put(skb, portid, seq, 0, NFC_CMD_VENDOR);
1640 if (!hdr) { 1604 if (!hdr) {
1641 kfree_skb(skb); 1605 kfree_skb(skb);
1642 return NULL; 1606 return NULL;
1643 } 1607 }
1644 1608
1645 if (nla_put_u32(skb, NFC_ATTR_DEVICE_ 1609 if (nla_put_u32(skb, NFC_ATTR_DEVICE_INDEX, dev->idx))
1646 goto nla_put_failure; 1610 goto nla_put_failure;
1647 if (nla_put_u32(skb, NFC_ATTR_VENDOR_ 1611 if (nla_put_u32(skb, NFC_ATTR_VENDOR_ID, oui))
1648 goto nla_put_failure; 1612 goto nla_put_failure;
1649 if (nla_put_u32(skb, NFC_ATTR_VENDOR_ 1613 if (nla_put_u32(skb, NFC_ATTR_VENDOR_SUBCMD, subcmd))
1650 goto nla_put_failure; 1614 goto nla_put_failure;
1651 1615
1652 ((void **)skb->cb)[0] = dev; 1616 ((void **)skb->cb)[0] = dev;
1653 ((void **)skb->cb)[1] = hdr; 1617 ((void **)skb->cb)[1] = hdr;
1654 1618
1655 return skb; 1619 return skb;
1656 1620
1657 nla_put_failure: 1621 nla_put_failure:
1658 kfree_skb(skb); 1622 kfree_skb(skb);
1659 return NULL; 1623 return NULL;
1660 } 1624 }
1661 1625
1662 struct sk_buff *__nfc_alloc_vendor_cmd_reply_ 1626 struct sk_buff *__nfc_alloc_vendor_cmd_reply_skb(struct nfc_dev *dev,
1663 1627 enum nfc_attrs attr,
1664 1628 u32 oui, u32 subcmd,
1665 1629 int approxlen)
1666 { 1630 {
1667 if (WARN_ON(!dev->cur_cmd_info)) 1631 if (WARN_ON(!dev->cur_cmd_info))
1668 return NULL; 1632 return NULL;
1669 1633
1670 return __nfc_alloc_vendor_cmd_skb(dev 1634 return __nfc_alloc_vendor_cmd_skb(dev, approxlen,
1671 dev 1635 dev->cur_cmd_info->snd_portid,
1672 dev 1636 dev->cur_cmd_info->snd_seq, attr,
1673 oui 1637 oui, subcmd, GFP_KERNEL);
1674 } 1638 }
1675 EXPORT_SYMBOL(__nfc_alloc_vendor_cmd_reply_sk 1639 EXPORT_SYMBOL(__nfc_alloc_vendor_cmd_reply_skb);
1676 1640
1677 int nfc_vendor_cmd_reply(struct sk_buff *skb) 1641 int nfc_vendor_cmd_reply(struct sk_buff *skb)
1678 { 1642 {
1679 struct nfc_dev *dev = ((void **)skb-> 1643 struct nfc_dev *dev = ((void **)skb->cb)[0];
1680 void *hdr = ((void **)skb->cb)[1]; 1644 void *hdr = ((void **)skb->cb)[1];
1681 1645
1682 /* clear CB data for netlink core to 1646 /* clear CB data for netlink core to own from now on */
1683 memset(skb->cb, 0, sizeof(skb->cb)); 1647 memset(skb->cb, 0, sizeof(skb->cb));
1684 1648
1685 if (WARN_ON(!dev->cur_cmd_info)) { 1649 if (WARN_ON(!dev->cur_cmd_info)) {
1686 kfree_skb(skb); 1650 kfree_skb(skb);
1687 return -EINVAL; 1651 return -EINVAL;
1688 } 1652 }
1689 1653
1690 genlmsg_end(skb, hdr); 1654 genlmsg_end(skb, hdr);
1691 return genlmsg_reply(skb, dev->cur_cm 1655 return genlmsg_reply(skb, dev->cur_cmd_info);
1692 } 1656 }
1693 EXPORT_SYMBOL(nfc_vendor_cmd_reply); 1657 EXPORT_SYMBOL(nfc_vendor_cmd_reply);
1694 1658
1695 static const struct genl_ops nfc_genl_ops[] = 1659 static const struct genl_ops nfc_genl_ops[] = {
1696 { 1660 {
1697 .cmd = NFC_CMD_GET_DEVICE, 1661 .cmd = NFC_CMD_GET_DEVICE,
1698 .validate = GENL_DONT_VALIDAT <<
1699 .doit = nfc_genl_get_device, 1662 .doit = nfc_genl_get_device,
1700 .dumpit = nfc_genl_dump_devic 1663 .dumpit = nfc_genl_dump_devices,
1701 .done = nfc_genl_dump_devices 1664 .done = nfc_genl_dump_devices_done,
>> 1665 .policy = nfc_genl_policy,
1702 }, 1666 },
1703 { 1667 {
1704 .cmd = NFC_CMD_DEV_UP, 1668 .cmd = NFC_CMD_DEV_UP,
1705 .validate = GENL_DONT_VALIDAT <<
1706 .doit = nfc_genl_dev_up, 1669 .doit = nfc_genl_dev_up,
1707 .flags = GENL_ADMIN_PERM, !! 1670 .policy = nfc_genl_policy,
1708 }, 1671 },
1709 { 1672 {
1710 .cmd = NFC_CMD_DEV_DOWN, 1673 .cmd = NFC_CMD_DEV_DOWN,
1711 .validate = GENL_DONT_VALIDAT <<
1712 .doit = nfc_genl_dev_down, 1674 .doit = nfc_genl_dev_down,
1713 .flags = GENL_ADMIN_PERM, !! 1675 .policy = nfc_genl_policy,
1714 }, 1676 },
1715 { 1677 {
1716 .cmd = NFC_CMD_START_POLL, 1678 .cmd = NFC_CMD_START_POLL,
1717 .validate = GENL_DONT_VALIDAT <<
1718 .doit = nfc_genl_start_poll, 1679 .doit = nfc_genl_start_poll,
1719 .flags = GENL_ADMIN_PERM, !! 1680 .policy = nfc_genl_policy,
1720 }, 1681 },
1721 { 1682 {
1722 .cmd = NFC_CMD_STOP_POLL, 1683 .cmd = NFC_CMD_STOP_POLL,
1723 .validate = GENL_DONT_VALIDAT <<
1724 .doit = nfc_genl_stop_poll, 1684 .doit = nfc_genl_stop_poll,
1725 .flags = GENL_ADMIN_PERM, !! 1685 .policy = nfc_genl_policy,
1726 }, 1686 },
1727 { 1687 {
1728 .cmd = NFC_CMD_DEP_LINK_UP, 1688 .cmd = NFC_CMD_DEP_LINK_UP,
1729 .validate = GENL_DONT_VALIDAT <<
1730 .doit = nfc_genl_dep_link_up, 1689 .doit = nfc_genl_dep_link_up,
1731 .flags = GENL_ADMIN_PERM, !! 1690 .policy = nfc_genl_policy,
1732 }, 1691 },
1733 { 1692 {
1734 .cmd = NFC_CMD_DEP_LINK_DOWN, 1693 .cmd = NFC_CMD_DEP_LINK_DOWN,
1735 .validate = GENL_DONT_VALIDAT <<
1736 .doit = nfc_genl_dep_link_dow 1694 .doit = nfc_genl_dep_link_down,
1737 .flags = GENL_ADMIN_PERM, !! 1695 .policy = nfc_genl_policy,
1738 }, 1696 },
1739 { 1697 {
1740 .cmd = NFC_CMD_GET_TARGET, 1698 .cmd = NFC_CMD_GET_TARGET,
1741 .validate = GENL_DONT_VALIDAT <<
1742 GENL_DONT_VALIDAT <<
1743 .dumpit = nfc_genl_dump_targe 1699 .dumpit = nfc_genl_dump_targets,
1744 .done = nfc_genl_dump_targets 1700 .done = nfc_genl_dump_targets_done,
>> 1701 .policy = nfc_genl_policy,
1745 }, 1702 },
1746 { 1703 {
1747 .cmd = NFC_CMD_LLC_GET_PARAMS 1704 .cmd = NFC_CMD_LLC_GET_PARAMS,
1748 .validate = GENL_DONT_VALIDAT <<
1749 .doit = nfc_genl_llc_get_para 1705 .doit = nfc_genl_llc_get_params,
>> 1706 .policy = nfc_genl_policy,
1750 }, 1707 },
1751 { 1708 {
1752 .cmd = NFC_CMD_LLC_SET_PARAMS 1709 .cmd = NFC_CMD_LLC_SET_PARAMS,
1753 .validate = GENL_DONT_VALIDAT <<
1754 .doit = nfc_genl_llc_set_para 1710 .doit = nfc_genl_llc_set_params,
1755 .flags = GENL_ADMIN_PERM, !! 1711 .policy = nfc_genl_policy,
1756 }, 1712 },
1757 { 1713 {
1758 .cmd = NFC_CMD_LLC_SDREQ, 1714 .cmd = NFC_CMD_LLC_SDREQ,
1759 .validate = GENL_DONT_VALIDAT <<
1760 .doit = nfc_genl_llc_sdreq, 1715 .doit = nfc_genl_llc_sdreq,
1761 .flags = GENL_ADMIN_PERM, !! 1716 .policy = nfc_genl_policy,
1762 }, 1717 },
1763 { 1718 {
1764 .cmd = NFC_CMD_FW_DOWNLOAD, 1719 .cmd = NFC_CMD_FW_DOWNLOAD,
1765 .validate = GENL_DONT_VALIDAT <<
1766 .doit = nfc_genl_fw_download, 1720 .doit = nfc_genl_fw_download,
1767 .flags = GENL_ADMIN_PERM, !! 1721 .policy = nfc_genl_policy,
1768 }, 1722 },
1769 { 1723 {
1770 .cmd = NFC_CMD_ENABLE_SE, 1724 .cmd = NFC_CMD_ENABLE_SE,
1771 .validate = GENL_DONT_VALIDAT <<
1772 .doit = nfc_genl_enable_se, 1725 .doit = nfc_genl_enable_se,
1773 .flags = GENL_ADMIN_PERM, !! 1726 .policy = nfc_genl_policy,
1774 }, 1727 },
1775 { 1728 {
1776 .cmd = NFC_CMD_DISABLE_SE, 1729 .cmd = NFC_CMD_DISABLE_SE,
1777 .validate = GENL_DONT_VALIDAT <<
1778 .doit = nfc_genl_disable_se, 1730 .doit = nfc_genl_disable_se,
1779 .flags = GENL_ADMIN_PERM, !! 1731 .policy = nfc_genl_policy,
1780 }, 1732 },
1781 { 1733 {
1782 .cmd = NFC_CMD_GET_SE, 1734 .cmd = NFC_CMD_GET_SE,
1783 .validate = GENL_DONT_VALIDAT <<
1784 .dumpit = nfc_genl_dump_ses, 1735 .dumpit = nfc_genl_dump_ses,
1785 .done = nfc_genl_dump_ses_don 1736 .done = nfc_genl_dump_ses_done,
>> 1737 .policy = nfc_genl_policy,
1786 }, 1738 },
1787 { 1739 {
1788 .cmd = NFC_CMD_SE_IO, 1740 .cmd = NFC_CMD_SE_IO,
1789 .validate = GENL_DONT_VALIDAT <<
1790 .doit = nfc_genl_se_io, 1741 .doit = nfc_genl_se_io,
1791 .flags = GENL_ADMIN_PERM, !! 1742 .policy = nfc_genl_policy,
1792 }, 1743 },
1793 { 1744 {
1794 .cmd = NFC_CMD_ACTIVATE_TARGE 1745 .cmd = NFC_CMD_ACTIVATE_TARGET,
1795 .validate = GENL_DONT_VALIDAT <<
1796 .doit = nfc_genl_activate_tar 1746 .doit = nfc_genl_activate_target,
1797 .flags = GENL_ADMIN_PERM, !! 1747 .policy = nfc_genl_policy,
1798 }, 1748 },
1799 { 1749 {
1800 .cmd = NFC_CMD_VENDOR, 1750 .cmd = NFC_CMD_VENDOR,
1801 .validate = GENL_DONT_VALIDAT <<
1802 .doit = nfc_genl_vendor_cmd, 1751 .doit = nfc_genl_vendor_cmd,
1803 .flags = GENL_ADMIN_PERM, !! 1752 .policy = nfc_genl_policy,
1804 }, <<
1805 { <<
1806 .cmd = NFC_CMD_DEACTIVATE_TAR <<
1807 .validate = GENL_DONT_VALIDAT <<
1808 .doit = nfc_genl_deactivate_t <<
1809 .flags = GENL_ADMIN_PERM, <<
1810 }, 1753 },
1811 }; 1754 };
1812 1755
1813 static struct genl_family nfc_genl_family __r 1756 static struct genl_family nfc_genl_family __ro_after_init = {
1814 .hdrsize = 0, 1757 .hdrsize = 0,
1815 .name = NFC_GENL_NAME, 1758 .name = NFC_GENL_NAME,
1816 .version = NFC_GENL_VERSION, 1759 .version = NFC_GENL_VERSION,
1817 .maxattr = NFC_ATTR_MAX, 1760 .maxattr = NFC_ATTR_MAX,
1818 .policy = nfc_genl_policy, <<
1819 .module = THIS_MODULE, 1761 .module = THIS_MODULE,
1820 .ops = nfc_genl_ops, 1762 .ops = nfc_genl_ops,
1821 .n_ops = ARRAY_SIZE(nfc_genl_ops), 1763 .n_ops = ARRAY_SIZE(nfc_genl_ops),
1822 .resv_start_op = NFC_CMD_DEACTIVATE_T <<
1823 .mcgrps = nfc_genl_mcgrps, 1764 .mcgrps = nfc_genl_mcgrps,
1824 .n_mcgrps = ARRAY_SIZE(nfc_genl_mcgrp 1765 .n_mcgrps = ARRAY_SIZE(nfc_genl_mcgrps),
1825 }; 1766 };
1826 1767
1827 1768
1828 struct urelease_work { 1769 struct urelease_work {
1829 struct work_struct w; 1770 struct work_struct w;
1830 u32 portid; 1771 u32 portid;
1831 }; 1772 };
1832 1773
1833 static void nfc_urelease_event_work(struct wo 1774 static void nfc_urelease_event_work(struct work_struct *work)
1834 { 1775 {
1835 struct urelease_work *w = container_o 1776 struct urelease_work *w = container_of(work, struct urelease_work, w);
1836 struct class_dev_iter iter; 1777 struct class_dev_iter iter;
1837 struct nfc_dev *dev; 1778 struct nfc_dev *dev;
1838 1779
1839 pr_debug("portid %d\n", w->portid); 1780 pr_debug("portid %d\n", w->portid);
1840 1781
1841 mutex_lock(&nfc_devlist_mutex); 1782 mutex_lock(&nfc_devlist_mutex);
1842 1783
1843 nfc_device_iter_init(&iter); 1784 nfc_device_iter_init(&iter);
1844 dev = nfc_device_iter_next(&iter); 1785 dev = nfc_device_iter_next(&iter);
1845 1786
1846 while (dev) { 1787 while (dev) {
1847 mutex_lock(&dev->genl_data.ge 1788 mutex_lock(&dev->genl_data.genl_data_mutex);
1848 1789
1849 if (dev->genl_data.poll_req_p 1790 if (dev->genl_data.poll_req_portid == w->portid) {
1850 nfc_stop_poll(dev); 1791 nfc_stop_poll(dev);
1851 dev->genl_data.poll_r 1792 dev->genl_data.poll_req_portid = 0;
1852 } 1793 }
1853 1794
1854 mutex_unlock(&dev->genl_data. 1795 mutex_unlock(&dev->genl_data.genl_data_mutex);
1855 1796
1856 dev = nfc_device_iter_next(&i 1797 dev = nfc_device_iter_next(&iter);
1857 } 1798 }
1858 1799
1859 nfc_device_iter_exit(&iter); 1800 nfc_device_iter_exit(&iter);
1860 1801
1861 mutex_unlock(&nfc_devlist_mutex); 1802 mutex_unlock(&nfc_devlist_mutex);
1862 1803
1863 kfree(w); 1804 kfree(w);
1864 } 1805 }
1865 1806
1866 static int nfc_genl_rcv_nl_event(struct notif 1807 static int nfc_genl_rcv_nl_event(struct notifier_block *this,
1867 unsigned lon 1808 unsigned long event, void *ptr)
1868 { 1809 {
1869 struct netlink_notify *n = ptr; 1810 struct netlink_notify *n = ptr;
1870 struct urelease_work *w; 1811 struct urelease_work *w;
1871 1812
1872 if (event != NETLINK_URELEASE || n->p 1813 if (event != NETLINK_URELEASE || n->protocol != NETLINK_GENERIC)
1873 goto out; 1814 goto out;
1874 1815
1875 pr_debug("NETLINK_URELEASE event from 1816 pr_debug("NETLINK_URELEASE event from id %d\n", n->portid);
1876 1817
1877 w = kmalloc(sizeof(*w), GFP_ATOMIC); 1818 w = kmalloc(sizeof(*w), GFP_ATOMIC);
1878 if (w) { 1819 if (w) {
1879 INIT_WORK(&w->w, nfc_urelease !! 1820 INIT_WORK((struct work_struct *) w, nfc_urelease_event_work);
1880 w->portid = n->portid; 1821 w->portid = n->portid;
1881 schedule_work(&w->w); !! 1822 schedule_work((struct work_struct *) w);
1882 } 1823 }
1883 1824
1884 out: 1825 out:
1885 return NOTIFY_DONE; 1826 return NOTIFY_DONE;
1886 } 1827 }
1887 1828
1888 void nfc_genl_data_init(struct nfc_genl_data 1829 void nfc_genl_data_init(struct nfc_genl_data *genl_data)
1889 { 1830 {
1890 genl_data->poll_req_portid = 0; 1831 genl_data->poll_req_portid = 0;
1891 mutex_init(&genl_data->genl_data_mute 1832 mutex_init(&genl_data->genl_data_mutex);
1892 } 1833 }
1893 1834
1894 void nfc_genl_data_exit(struct nfc_genl_data 1835 void nfc_genl_data_exit(struct nfc_genl_data *genl_data)
1895 { 1836 {
1896 mutex_destroy(&genl_data->genl_data_m 1837 mutex_destroy(&genl_data->genl_data_mutex);
1897 } 1838 }
1898 1839
1899 static struct notifier_block nl_notifier = { 1840 static struct notifier_block nl_notifier = {
1900 .notifier_call = nfc_genl_rcv_nl_eve 1841 .notifier_call = nfc_genl_rcv_nl_event,
1901 }; 1842 };
1902 1843
1903 /** 1844 /**
1904 * nfc_genl_init() - Initialize netlink inter 1845 * nfc_genl_init() - Initialize netlink interface
1905 * 1846 *
1906 * This initialization function registers the 1847 * This initialization function registers the nfc netlink family.
1907 */ 1848 */
1908 int __init nfc_genl_init(void) 1849 int __init nfc_genl_init(void)
1909 { 1850 {
1910 int rc; 1851 int rc;
1911 1852
1912 rc = genl_register_family(&nfc_genl_f 1853 rc = genl_register_family(&nfc_genl_family);
1913 if (rc) 1854 if (rc)
1914 return rc; 1855 return rc;
1915 1856
1916 netlink_register_notifier(&nl_notifie 1857 netlink_register_notifier(&nl_notifier);
1917 1858
1918 return 0; 1859 return 0;
1919 } 1860 }
1920 1861
1921 /** 1862 /**
1922 * nfc_genl_exit() - Deinitialize netlink int 1863 * nfc_genl_exit() - Deinitialize netlink interface
1923 * 1864 *
1924 * This exit function unregisters the nfc net 1865 * This exit function unregisters the nfc netlink family.
1925 */ 1866 */
1926 void nfc_genl_exit(void) 1867 void nfc_genl_exit(void)
1927 { 1868 {
1928 netlink_unregister_notifier(&nl_notif 1869 netlink_unregister_notifier(&nl_notifier);
1929 genl_unregister_family(&nfc_genl_fami 1870 genl_unregister_family(&nfc_genl_family);
1930 } 1871 }
1931 1872
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.