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