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