Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d9973179aef2af88b6fe4cc1df7ced6fe7cec7d0

Authored by Hendrik Brueckner
Committed by David S. Miller
1 parent b29e4da41e
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

af_iucv: fix race in __iucv_sock_wait() 

Moving prepare_to_wait before the condition to avoid a race between
schedule_timeout and wake up.
The race can appear during iucv_sock_connect() and iucv_callback_connack().

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 1 additions and 1 deletions Inline Diff

1 /* 1 /*
2 * IUCV protocol stack for Linux on zSeries 2 * IUCV protocol stack for Linux on zSeries
3 * 3 *
4 * Copyright IBM Corp. 2006, 2009 4 * Copyright IBM Corp. 2006, 2009
5 * 5 *
6 * Author(s): Jennifer Hunt <jenhunt@us.ibm.com> 6 * Author(s): Jennifer Hunt <jenhunt@us.ibm.com>
7 * Hendrik Brueckner <brueckner@linux.vnet.ibm.com> 7 * Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
8 * PM functions: 8 * PM functions:
9 * Ursula Braun <ursula.braun@de.ibm.com> 9 * Ursula Braun <ursula.braun@de.ibm.com>
10 */ 10 */
11 11
12 #define KMSG_COMPONENT "af_iucv" 12 #define KMSG_COMPONENT "af_iucv"
13 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt 13 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
14 14
15 #include <linux/module.h> 15 #include <linux/module.h>
16 #include <linux/types.h> 16 #include <linux/types.h>
17 #include <linux/list.h> 17 #include <linux/list.h>
18 #include <linux/errno.h> 18 #include <linux/errno.h>
19 #include <linux/kernel.h> 19 #include <linux/kernel.h>
20 #include <linux/sched.h> 20 #include <linux/sched.h>
21 #include <linux/slab.h> 21 #include <linux/slab.h>
22 #include <linux/skbuff.h> 22 #include <linux/skbuff.h>
23 #include <linux/init.h> 23 #include <linux/init.h>
24 #include <linux/poll.h> 24 #include <linux/poll.h>
25 #include <net/sock.h> 25 #include <net/sock.h>
26 #include <asm/ebcdic.h> 26 #include <asm/ebcdic.h>
27 #include <asm/cpcmd.h> 27 #include <asm/cpcmd.h>
28 #include <linux/kmod.h> 28 #include <linux/kmod.h>
29 29
30 #include <net/iucv/iucv.h> 30 #include <net/iucv/iucv.h>
31 #include <net/iucv/af_iucv.h> 31 #include <net/iucv/af_iucv.h>
32 32
33 #define VERSION "1.1" 33 #define VERSION "1.1"
34 34
35 static char iucv_userid[80]; 35 static char iucv_userid[80];
36 36
37 static const struct proto_ops iucv_sock_ops; 37 static const struct proto_ops iucv_sock_ops;
38 38
39 static struct proto iucv_proto = { 39 static struct proto iucv_proto = {
40 .name = "AF_IUCV", 40 .name = "AF_IUCV",
41 .owner = THIS_MODULE, 41 .owner = THIS_MODULE,
42 .obj_size = sizeof(struct iucv_sock), 42 .obj_size = sizeof(struct iucv_sock),
43 }; 43 };
44 44
45 /* special AF_IUCV IPRM messages */ 45 /* special AF_IUCV IPRM messages */
46 static const u8 iprm_shutdown[8] = 46 static const u8 iprm_shutdown[8] =
47 {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}; 47 {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
48 48
49 #define TRGCLS_SIZE (sizeof(((struct iucv_message *)0)->class)) 49 #define TRGCLS_SIZE (sizeof(((struct iucv_message *)0)->class))
50 50
51 /* macros to set/get socket control buffer at correct offset */ 51 /* macros to set/get socket control buffer at correct offset */
52 #define CB_TAG(skb) ((skb)->cb) /* iucv message tag */ 52 #define CB_TAG(skb) ((skb)->cb) /* iucv message tag */
53 #define CB_TAG_LEN (sizeof(((struct iucv_message *) 0)->tag)) 53 #define CB_TAG_LEN (sizeof(((struct iucv_message *) 0)->tag))
54 #define CB_TRGCLS(skb) ((skb)->cb + CB_TAG_LEN) /* iucv msg target class */ 54 #define CB_TRGCLS(skb) ((skb)->cb + CB_TAG_LEN) /* iucv msg target class */
55 #define CB_TRGCLS_LEN (TRGCLS_SIZE) 55 #define CB_TRGCLS_LEN (TRGCLS_SIZE)
56 56
57 #define __iucv_sock_wait(sk, condition, timeo, ret) \ 57 #define __iucv_sock_wait(sk, condition, timeo, ret) \
58 do { \ 58 do { \
59 DEFINE_WAIT(__wait); \ 59 DEFINE_WAIT(__wait); \
60 long __timeo = timeo; \ 60 long __timeo = timeo; \
61 ret = 0; \ 61 ret = 0; \
62 prepare_to_wait(sk->sk_sleep, &__wait, TASK_INTERRUPTIBLE); \
62 while (!(condition)) { \ 63 while (!(condition)) { \
63 prepare_to_wait(sk->sk_sleep, &__wait, TASK_INTERRUPTIBLE); \
64 if (!__timeo) { \ 64 if (!__timeo) { \
65 ret = -EAGAIN; \ 65 ret = -EAGAIN; \
66 break; \ 66 break; \
67 } \ 67 } \
68 if (signal_pending(current)) { \ 68 if (signal_pending(current)) { \
69 ret = sock_intr_errno(__timeo); \ 69 ret = sock_intr_errno(__timeo); \
70 break; \ 70 break; \
71 } \ 71 } \
72 release_sock(sk); \ 72 release_sock(sk); \
73 __timeo = schedule_timeout(__timeo); \ 73 __timeo = schedule_timeout(__timeo); \
74 lock_sock(sk); \ 74 lock_sock(sk); \
75 ret = sock_error(sk); \ 75 ret = sock_error(sk); \
76 if (ret) \ 76 if (ret) \
77 break; \ 77 break; \
78 } \ 78 } \
79 finish_wait(sk->sk_sleep, &__wait); \ 79 finish_wait(sk->sk_sleep, &__wait); \
80 } while (0) 80 } while (0)
81 81
82 #define iucv_sock_wait(sk, condition, timeo) \ 82 #define iucv_sock_wait(sk, condition, timeo) \
83 ({ \ 83 ({ \
84 int __ret = 0; \ 84 int __ret = 0; \
85 if (!(condition)) \ 85 if (!(condition)) \
86 __iucv_sock_wait(sk, condition, timeo, __ret); \ 86 __iucv_sock_wait(sk, condition, timeo, __ret); \
87 __ret; \ 87 __ret; \
88 }) 88 })
89 89
90 static void iucv_sock_kill(struct sock *sk); 90 static void iucv_sock_kill(struct sock *sk);
91 static void iucv_sock_close(struct sock *sk); 91 static void iucv_sock_close(struct sock *sk);
92 92
93 /* Call Back functions */ 93 /* Call Back functions */
94 static void iucv_callback_rx(struct iucv_path *, struct iucv_message *); 94 static void iucv_callback_rx(struct iucv_path *, struct iucv_message *);
95 static void iucv_callback_txdone(struct iucv_path *, struct iucv_message *); 95 static void iucv_callback_txdone(struct iucv_path *, struct iucv_message *);
96 static void iucv_callback_connack(struct iucv_path *, u8 ipuser[16]); 96 static void iucv_callback_connack(struct iucv_path *, u8 ipuser[16]);
97 static int iucv_callback_connreq(struct iucv_path *, u8 ipvmid[8], 97 static int iucv_callback_connreq(struct iucv_path *, u8 ipvmid[8],
98 u8 ipuser[16]); 98 u8 ipuser[16]);
99 static void iucv_callback_connrej(struct iucv_path *, u8 ipuser[16]); 99 static void iucv_callback_connrej(struct iucv_path *, u8 ipuser[16]);
100 static void iucv_callback_shutdown(struct iucv_path *, u8 ipuser[16]); 100 static void iucv_callback_shutdown(struct iucv_path *, u8 ipuser[16]);
101 101
102 static struct iucv_sock_list iucv_sk_list = { 102 static struct iucv_sock_list iucv_sk_list = {
103 .lock = __RW_LOCK_UNLOCKED(iucv_sk_list.lock), 103 .lock = __RW_LOCK_UNLOCKED(iucv_sk_list.lock),
104 .autobind_name = ATOMIC_INIT(0) 104 .autobind_name = ATOMIC_INIT(0)
105 }; 105 };
106 106
107 static struct iucv_handler af_iucv_handler = { 107 static struct iucv_handler af_iucv_handler = {
108 .path_pending = iucv_callback_connreq, 108 .path_pending = iucv_callback_connreq,
109 .path_complete = iucv_callback_connack, 109 .path_complete = iucv_callback_connack,
110 .path_severed = iucv_callback_connrej, 110 .path_severed = iucv_callback_connrej,
111 .message_pending = iucv_callback_rx, 111 .message_pending = iucv_callback_rx,
112 .message_complete = iucv_callback_txdone, 112 .message_complete = iucv_callback_txdone,
113 .path_quiesced = iucv_callback_shutdown, 113 .path_quiesced = iucv_callback_shutdown,
114 }; 114 };
115 115
116 static inline void high_nmcpy(unsigned char *dst, char *src) 116 static inline void high_nmcpy(unsigned char *dst, char *src)
117 { 117 {
118 memcpy(dst, src, 8); 118 memcpy(dst, src, 8);
119 } 119 }
120 120
121 static inline void low_nmcpy(unsigned char *dst, char *src) 121 static inline void low_nmcpy(unsigned char *dst, char *src)
122 { 122 {
123 memcpy(&dst[8], src, 8); 123 memcpy(&dst[8], src, 8);
124 } 124 }
125 125
126 static int afiucv_pm_prepare(struct device *dev) 126 static int afiucv_pm_prepare(struct device *dev)
127 { 127 {
128 #ifdef CONFIG_PM_DEBUG 128 #ifdef CONFIG_PM_DEBUG
129 printk(KERN_WARNING "afiucv_pm_prepare\n"); 129 printk(KERN_WARNING "afiucv_pm_prepare\n");
130 #endif 130 #endif
131 return 0; 131 return 0;
132 } 132 }
133 133
134 static void afiucv_pm_complete(struct device *dev) 134 static void afiucv_pm_complete(struct device *dev)
135 { 135 {
136 #ifdef CONFIG_PM_DEBUG 136 #ifdef CONFIG_PM_DEBUG
137 printk(KERN_WARNING "afiucv_pm_complete\n"); 137 printk(KERN_WARNING "afiucv_pm_complete\n");
138 #endif 138 #endif
139 return; 139 return;
140 } 140 }
141 141
142 /** 142 /**
143 * afiucv_pm_freeze() - Freeze PM callback 143 * afiucv_pm_freeze() - Freeze PM callback
144 * @dev: AFIUCV dummy device 144 * @dev: AFIUCV dummy device
145 * 145 *
146 * Sever all established IUCV communication pathes 146 * Sever all established IUCV communication pathes
147 */ 147 */
148 static int afiucv_pm_freeze(struct device *dev) 148 static int afiucv_pm_freeze(struct device *dev)
149 { 149 {
150 struct iucv_sock *iucv; 150 struct iucv_sock *iucv;
151 struct sock *sk; 151 struct sock *sk;
152 struct hlist_node *node; 152 struct hlist_node *node;
153 int err = 0; 153 int err = 0;
154 154
155 #ifdef CONFIG_PM_DEBUG 155 #ifdef CONFIG_PM_DEBUG
156 printk(KERN_WARNING "afiucv_pm_freeze\n"); 156 printk(KERN_WARNING "afiucv_pm_freeze\n");
157 #endif 157 #endif
158 read_lock(&iucv_sk_list.lock); 158 read_lock(&iucv_sk_list.lock);
159 sk_for_each(sk, node, &iucv_sk_list.head) { 159 sk_for_each(sk, node, &iucv_sk_list.head) {
160 iucv = iucv_sk(sk); 160 iucv = iucv_sk(sk);
161 skb_queue_purge(&iucv->send_skb_q); 161 skb_queue_purge(&iucv->send_skb_q);
162 skb_queue_purge(&iucv->backlog_skb_q); 162 skb_queue_purge(&iucv->backlog_skb_q);
163 switch (sk->sk_state) { 163 switch (sk->sk_state) {
164 case IUCV_SEVERED: 164 case IUCV_SEVERED:
165 case IUCV_DISCONN: 165 case IUCV_DISCONN:
166 case IUCV_CLOSING: 166 case IUCV_CLOSING:
167 case IUCV_CONNECTED: 167 case IUCV_CONNECTED:
168 if (iucv->path) { 168 if (iucv->path) {
169 err = iucv_path_sever(iucv->path, NULL); 169 err = iucv_path_sever(iucv->path, NULL);
170 iucv_path_free(iucv->path); 170 iucv_path_free(iucv->path);
171 iucv->path = NULL; 171 iucv->path = NULL;
172 } 172 }
173 break; 173 break;
174 case IUCV_OPEN: 174 case IUCV_OPEN:
175 case IUCV_BOUND: 175 case IUCV_BOUND:
176 case IUCV_LISTEN: 176 case IUCV_LISTEN:
177 case IUCV_CLOSED: 177 case IUCV_CLOSED:
178 default: 178 default:
179 break; 179 break;
180 } 180 }
181 } 181 }
182 read_unlock(&iucv_sk_list.lock); 182 read_unlock(&iucv_sk_list.lock);
183 return err; 183 return err;
184 } 184 }
185 185
186 /** 186 /**
187 * afiucv_pm_restore_thaw() - Thaw and restore PM callback 187 * afiucv_pm_restore_thaw() - Thaw and restore PM callback
188 * @dev: AFIUCV dummy device 188 * @dev: AFIUCV dummy device
189 * 189 *
190 * socket clean up after freeze 190 * socket clean up after freeze
191 */ 191 */
192 static int afiucv_pm_restore_thaw(struct device *dev) 192 static int afiucv_pm_restore_thaw(struct device *dev)
193 { 193 {
194 struct iucv_sock *iucv; 194 struct iucv_sock *iucv;
195 struct sock *sk; 195 struct sock *sk;
196 struct hlist_node *node; 196 struct hlist_node *node;
197 197
198 #ifdef CONFIG_PM_DEBUG 198 #ifdef CONFIG_PM_DEBUG
199 printk(KERN_WARNING "afiucv_pm_restore_thaw\n"); 199 printk(KERN_WARNING "afiucv_pm_restore_thaw\n");
200 #endif 200 #endif
201 read_lock(&iucv_sk_list.lock); 201 read_lock(&iucv_sk_list.lock);
202 sk_for_each(sk, node, &iucv_sk_list.head) { 202 sk_for_each(sk, node, &iucv_sk_list.head) {
203 iucv = iucv_sk(sk); 203 iucv = iucv_sk(sk);
204 switch (sk->sk_state) { 204 switch (sk->sk_state) {
205 case IUCV_CONNECTED: 205 case IUCV_CONNECTED:
206 sk->sk_err = EPIPE; 206 sk->sk_err = EPIPE;
207 sk->sk_state = IUCV_DISCONN; 207 sk->sk_state = IUCV_DISCONN;
208 sk->sk_state_change(sk); 208 sk->sk_state_change(sk);
209 break; 209 break;
210 case IUCV_DISCONN: 210 case IUCV_DISCONN:
211 case IUCV_SEVERED: 211 case IUCV_SEVERED:
212 case IUCV_CLOSING: 212 case IUCV_CLOSING:
213 case IUCV_LISTEN: 213 case IUCV_LISTEN:
214 case IUCV_BOUND: 214 case IUCV_BOUND:
215 case IUCV_OPEN: 215 case IUCV_OPEN:
216 default: 216 default:
217 break; 217 break;
218 } 218 }
219 } 219 }
220 read_unlock(&iucv_sk_list.lock); 220 read_unlock(&iucv_sk_list.lock);
221 return 0; 221 return 0;
222 } 222 }
223 223
224 static struct dev_pm_ops afiucv_pm_ops = { 224 static struct dev_pm_ops afiucv_pm_ops = {
225 .prepare = afiucv_pm_prepare, 225 .prepare = afiucv_pm_prepare,
226 .complete = afiucv_pm_complete, 226 .complete = afiucv_pm_complete,
227 .freeze = afiucv_pm_freeze, 227 .freeze = afiucv_pm_freeze,
228 .thaw = afiucv_pm_restore_thaw, 228 .thaw = afiucv_pm_restore_thaw,
229 .restore = afiucv_pm_restore_thaw, 229 .restore = afiucv_pm_restore_thaw,
230 }; 230 };
231 231
232 static struct device_driver af_iucv_driver = { 232 static struct device_driver af_iucv_driver = {
233 .owner = THIS_MODULE, 233 .owner = THIS_MODULE,
234 .name = "afiucv", 234 .name = "afiucv",
235 .bus = &iucv_bus, 235 .bus = &iucv_bus,
236 .pm = &afiucv_pm_ops, 236 .pm = &afiucv_pm_ops,
237 }; 237 };
238 238
239 /* dummy device used as trigger for PM functions */ 239 /* dummy device used as trigger for PM functions */
240 static struct device *af_iucv_dev; 240 static struct device *af_iucv_dev;
241 241
242 /** 242 /**
243 * iucv_msg_length() - Returns the length of an iucv message. 243 * iucv_msg_length() - Returns the length of an iucv message.
244 * @msg: Pointer to struct iucv_message, MUST NOT be NULL 244 * @msg: Pointer to struct iucv_message, MUST NOT be NULL
245 * 245 *
246 * The function returns the length of the specified iucv message @msg of data 246 * The function returns the length of the specified iucv message @msg of data
247 * stored in a buffer and of data stored in the parameter list (PRMDATA). 247 * stored in a buffer and of data stored in the parameter list (PRMDATA).
248 * 248 *
249 * For IUCV_IPRMDATA, AF_IUCV uses the following convention to transport socket 249 * For IUCV_IPRMDATA, AF_IUCV uses the following convention to transport socket
250 * data: 250 * data:
251 * PRMDATA[0..6] socket data (max 7 bytes); 251 * PRMDATA[0..6] socket data (max 7 bytes);
252 * PRMDATA[7] socket data length value (len is 0xff - PRMDATA[7]) 252 * PRMDATA[7] socket data length value (len is 0xff - PRMDATA[7])
253 * 253 *
254 * The socket data length is computed by substracting the socket data length 254 * The socket data length is computed by substracting the socket data length
255 * value from 0xFF. 255 * value from 0xFF.
256 * If the socket data len is greater 7, then PRMDATA can be used for special 256 * If the socket data len is greater 7, then PRMDATA can be used for special
257 * notifications (see iucv_sock_shutdown); and further, 257 * notifications (see iucv_sock_shutdown); and further,
258 * if the socket data len is > 7, the function returns 8. 258 * if the socket data len is > 7, the function returns 8.
259 * 259 *
260 * Use this function to allocate socket buffers to store iucv message data. 260 * Use this function to allocate socket buffers to store iucv message data.
261 */ 261 */
262 static inline size_t iucv_msg_length(struct iucv_message *msg) 262 static inline size_t iucv_msg_length(struct iucv_message *msg)
263 { 263 {
264 size_t datalen; 264 size_t datalen;
265 265
266 if (msg->flags & IUCV_IPRMDATA) { 266 if (msg->flags & IUCV_IPRMDATA) {
267 datalen = 0xff - msg->rmmsg[7]; 267 datalen = 0xff - msg->rmmsg[7];
268 return (datalen < 8) ? datalen : 8; 268 return (datalen < 8) ? datalen : 8;
269 } 269 }
270 return msg->length; 270 return msg->length;
271 } 271 }
272 272
273 /** 273 /**
274 * iucv_sock_in_state() - check for specific states 274 * iucv_sock_in_state() - check for specific states
275 * @sk: sock structure 275 * @sk: sock structure
276 * @state: first iucv sk state 276 * @state: first iucv sk state
277 * @state: second iucv sk state 277 * @state: second iucv sk state
278 * 278 *
279 * Returns true if the socket in either in the first or second state. 279 * Returns true if the socket in either in the first or second state.
280 */ 280 */
281 static int iucv_sock_in_state(struct sock *sk, int state, int state2) 281 static int iucv_sock_in_state(struct sock *sk, int state, int state2)
282 { 282 {
283 return (sk->sk_state == state || sk->sk_state == state2); 283 return (sk->sk_state == state || sk->sk_state == state2);
284 } 284 }
285 285
286 /** 286 /**
287 * iucv_below_msglim() - function to check if messages can be sent 287 * iucv_below_msglim() - function to check if messages can be sent
288 * @sk: sock structure 288 * @sk: sock structure
289 * 289 *
290 * Returns true if the send queue length is lower than the message limit. 290 * Returns true if the send queue length is lower than the message limit.
291 * Always returns true if the socket is not connected (no iucv path for 291 * Always returns true if the socket is not connected (no iucv path for
292 * checking the message limit). 292 * checking the message limit).
293 */ 293 */
294 static inline int iucv_below_msglim(struct sock *sk) 294 static inline int iucv_below_msglim(struct sock *sk)
295 { 295 {
296 struct iucv_sock *iucv = iucv_sk(sk); 296 struct iucv_sock *iucv = iucv_sk(sk);
297 297
298 if (sk->sk_state != IUCV_CONNECTED) 298 if (sk->sk_state != IUCV_CONNECTED)
299 return 1; 299 return 1;
300 return (skb_queue_len(&iucv->send_skb_q) < iucv->path->msglim); 300 return (skb_queue_len(&iucv->send_skb_q) < iucv->path->msglim);
301 } 301 }
302 302
303 /** 303 /**
304 * iucv_sock_wake_msglim() - Wake up thread waiting on msg limit 304 * iucv_sock_wake_msglim() - Wake up thread waiting on msg limit
305 */ 305 */
306 static void iucv_sock_wake_msglim(struct sock *sk) 306 static void iucv_sock_wake_msglim(struct sock *sk)
307 { 307 {
308 read_lock(&sk->sk_callback_lock); 308 read_lock(&sk->sk_callback_lock);
309 if (sk_has_sleeper(sk)) 309 if (sk_has_sleeper(sk))
310 wake_up_interruptible_all(sk->sk_sleep); 310 wake_up_interruptible_all(sk->sk_sleep);
311 sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT); 311 sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);
312 read_unlock(&sk->sk_callback_lock); 312 read_unlock(&sk->sk_callback_lock);
313 } 313 }
314 314
315 /* Timers */ 315 /* Timers */
316 static void iucv_sock_timeout(unsigned long arg) 316 static void iucv_sock_timeout(unsigned long arg)
317 { 317 {
318 struct sock *sk = (struct sock *)arg; 318 struct sock *sk = (struct sock *)arg;
319 319
320 bh_lock_sock(sk); 320 bh_lock_sock(sk);
321 sk->sk_err = ETIMEDOUT; 321 sk->sk_err = ETIMEDOUT;
322 sk->sk_state_change(sk); 322 sk->sk_state_change(sk);
323 bh_unlock_sock(sk); 323 bh_unlock_sock(sk);
324 324
325 iucv_sock_kill(sk); 325 iucv_sock_kill(sk);
326 sock_put(sk); 326 sock_put(sk);
327 } 327 }
328 328
329 static void iucv_sock_clear_timer(struct sock *sk) 329 static void iucv_sock_clear_timer(struct sock *sk)
330 { 330 {
331 sk_stop_timer(sk, &sk->sk_timer); 331 sk_stop_timer(sk, &sk->sk_timer);
332 } 332 }
333 333
334 static struct sock *__iucv_get_sock_by_name(char *nm) 334 static struct sock *__iucv_get_sock_by_name(char *nm)
335 { 335 {
336 struct sock *sk; 336 struct sock *sk;
337 struct hlist_node *node; 337 struct hlist_node *node;
338 338
339 sk_for_each(sk, node, &iucv_sk_list.head) 339 sk_for_each(sk, node, &iucv_sk_list.head)
340 if (!memcmp(&iucv_sk(sk)->src_name, nm, 8)) 340 if (!memcmp(&iucv_sk(sk)->src_name, nm, 8))
341 return sk; 341 return sk;
342 342
343 return NULL; 343 return NULL;
344 } 344 }
345 345
346 static void iucv_sock_destruct(struct sock *sk) 346 static void iucv_sock_destruct(struct sock *sk)
347 { 347 {
348 skb_queue_purge(&sk->sk_receive_queue); 348 skb_queue_purge(&sk->sk_receive_queue);
349 skb_queue_purge(&sk->sk_write_queue); 349 skb_queue_purge(&sk->sk_write_queue);
350 } 350 }
351 351
352 /* Cleanup Listen */ 352 /* Cleanup Listen */
353 static void iucv_sock_cleanup_listen(struct sock *parent) 353 static void iucv_sock_cleanup_listen(struct sock *parent)
354 { 354 {
355 struct sock *sk; 355 struct sock *sk;
356 356
357 /* Close non-accepted connections */ 357 /* Close non-accepted connections */
358 while ((sk = iucv_accept_dequeue(parent, NULL))) { 358 while ((sk = iucv_accept_dequeue(parent, NULL))) {
359 iucv_sock_close(sk); 359 iucv_sock_close(sk);
360 iucv_sock_kill(sk); 360 iucv_sock_kill(sk);
361 } 361 }
362 362
363 parent->sk_state = IUCV_CLOSED; 363 parent->sk_state = IUCV_CLOSED;
364 sock_set_flag(parent, SOCK_ZAPPED); 364 sock_set_flag(parent, SOCK_ZAPPED);
365 } 365 }
366 366
367 /* Kill socket */ 367 /* Kill socket */
368 static void iucv_sock_kill(struct sock *sk) 368 static void iucv_sock_kill(struct sock *sk)
369 { 369 {
370 if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket) 370 if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket)
371 return; 371 return;
372 372
373 iucv_sock_unlink(&iucv_sk_list, sk); 373 iucv_sock_unlink(&iucv_sk_list, sk);
374 sock_set_flag(sk, SOCK_DEAD); 374 sock_set_flag(sk, SOCK_DEAD);
375 sock_put(sk); 375 sock_put(sk);
376 } 376 }
377 377
378 /* Close an IUCV socket */ 378 /* Close an IUCV socket */
379 static void iucv_sock_close(struct sock *sk) 379 static void iucv_sock_close(struct sock *sk)
380 { 380 {
381 unsigned char user_data[16]; 381 unsigned char user_data[16];
382 struct iucv_sock *iucv = iucv_sk(sk); 382 struct iucv_sock *iucv = iucv_sk(sk);
383 int err; 383 int err;
384 unsigned long timeo; 384 unsigned long timeo;
385 385
386 iucv_sock_clear_timer(sk); 386 iucv_sock_clear_timer(sk);
387 lock_sock(sk); 387 lock_sock(sk);
388 388
389 switch (sk->sk_state) { 389 switch (sk->sk_state) {
390 case IUCV_LISTEN: 390 case IUCV_LISTEN:
391 iucv_sock_cleanup_listen(sk); 391 iucv_sock_cleanup_listen(sk);
392 break; 392 break;
393 393
394 case IUCV_CONNECTED: 394 case IUCV_CONNECTED:
395 case IUCV_DISCONN: 395 case IUCV_DISCONN:
396 err = 0; 396 err = 0;
397 397
398 sk->sk_state = IUCV_CLOSING; 398 sk->sk_state = IUCV_CLOSING;
399 sk->sk_state_change(sk); 399 sk->sk_state_change(sk);
400 400
401 if (!skb_queue_empty(&iucv->send_skb_q)) { 401 if (!skb_queue_empty(&iucv->send_skb_q)) {
402 if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime) 402 if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)
403 timeo = sk->sk_lingertime; 403 timeo = sk->sk_lingertime;
404 else 404 else
405 timeo = IUCV_DISCONN_TIMEOUT; 405 timeo = IUCV_DISCONN_TIMEOUT;
406 err = iucv_sock_wait(sk, 406 err = iucv_sock_wait(sk,
407 iucv_sock_in_state(sk, IUCV_CLOSED, 0), 407 iucv_sock_in_state(sk, IUCV_CLOSED, 0),
408 timeo); 408 timeo);
409 } 409 }
410 410
411 case IUCV_CLOSING: /* fall through */ 411 case IUCV_CLOSING: /* fall through */
412 sk->sk_state = IUCV_CLOSED; 412 sk->sk_state = IUCV_CLOSED;
413 sk->sk_state_change(sk); 413 sk->sk_state_change(sk);
414 414
415 if (iucv->path) { 415 if (iucv->path) {
416 low_nmcpy(user_data, iucv->src_name); 416 low_nmcpy(user_data, iucv->src_name);
417 high_nmcpy(user_data, iucv->dst_name); 417 high_nmcpy(user_data, iucv->dst_name);
418 ASCEBC(user_data, sizeof(user_data)); 418 ASCEBC(user_data, sizeof(user_data));
419 err = iucv_path_sever(iucv->path, user_data); 419 err = iucv_path_sever(iucv->path, user_data);
420 iucv_path_free(iucv->path); 420 iucv_path_free(iucv->path);
421 iucv->path = NULL; 421 iucv->path = NULL;
422 } 422 }
423 423
424 sk->sk_err = ECONNRESET; 424 sk->sk_err = ECONNRESET;
425 sk->sk_state_change(sk); 425 sk->sk_state_change(sk);
426 426
427 skb_queue_purge(&iucv->send_skb_q); 427 skb_queue_purge(&iucv->send_skb_q);
428 skb_queue_purge(&iucv->backlog_skb_q); 428 skb_queue_purge(&iucv->backlog_skb_q);
429 429
430 sock_set_flag(sk, SOCK_ZAPPED); 430 sock_set_flag(sk, SOCK_ZAPPED);
431 break; 431 break;
432 432
433 default: 433 default:
434 sock_set_flag(sk, SOCK_ZAPPED); 434 sock_set_flag(sk, SOCK_ZAPPED);
435 break; 435 break;
436 } 436 }
437 437
438 release_sock(sk); 438 release_sock(sk);
439 iucv_sock_kill(sk); 439 iucv_sock_kill(sk);
440 } 440 }
441 441
442 static void iucv_sock_init(struct sock *sk, struct sock *parent) 442 static void iucv_sock_init(struct sock *sk, struct sock *parent)
443 { 443 {
444 if (parent) 444 if (parent)
445 sk->sk_type = parent->sk_type; 445 sk->sk_type = parent->sk_type;
446 } 446 }
447 447
448 static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio) 448 static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio)
449 { 449 {
450 struct sock *sk; 450 struct sock *sk;
451 451
452 sk = sk_alloc(&init_net, PF_IUCV, prio, &iucv_proto); 452 sk = sk_alloc(&init_net, PF_IUCV, prio, &iucv_proto);
453 if (!sk) 453 if (!sk)
454 return NULL; 454 return NULL;
455 455
456 sock_init_data(sock, sk); 456 sock_init_data(sock, sk);
457 INIT_LIST_HEAD(&iucv_sk(sk)->accept_q); 457 INIT_LIST_HEAD(&iucv_sk(sk)->accept_q);
458 spin_lock_init(&iucv_sk(sk)->accept_q_lock); 458 spin_lock_init(&iucv_sk(sk)->accept_q_lock);
459 skb_queue_head_init(&iucv_sk(sk)->send_skb_q); 459 skb_queue_head_init(&iucv_sk(sk)->send_skb_q);
460 INIT_LIST_HEAD(&iucv_sk(sk)->message_q.list); 460 INIT_LIST_HEAD(&iucv_sk(sk)->message_q.list);
461 spin_lock_init(&iucv_sk(sk)->message_q.lock); 461 spin_lock_init(&iucv_sk(sk)->message_q.lock);
462 skb_queue_head_init(&iucv_sk(sk)->backlog_skb_q); 462 skb_queue_head_init(&iucv_sk(sk)->backlog_skb_q);
463 iucv_sk(sk)->send_tag = 0; 463 iucv_sk(sk)->send_tag = 0;
464 iucv_sk(sk)->flags = 0; 464 iucv_sk(sk)->flags = 0;
465 iucv_sk(sk)->msglimit = IUCV_QUEUELEN_DEFAULT; 465 iucv_sk(sk)->msglimit = IUCV_QUEUELEN_DEFAULT;
466 iucv_sk(sk)->path = NULL; 466 iucv_sk(sk)->path = NULL;
467 memset(&iucv_sk(sk)->src_user_id , 0, 32); 467 memset(&iucv_sk(sk)->src_user_id , 0, 32);
468 468
469 sk->sk_destruct = iucv_sock_destruct; 469 sk->sk_destruct = iucv_sock_destruct;
470 sk->sk_sndtimeo = IUCV_CONN_TIMEOUT; 470 sk->sk_sndtimeo = IUCV_CONN_TIMEOUT;
471 sk->sk_allocation = GFP_DMA; 471 sk->sk_allocation = GFP_DMA;
472 472
473 sock_reset_flag(sk, SOCK_ZAPPED); 473 sock_reset_flag(sk, SOCK_ZAPPED);
474 474
475 sk->sk_protocol = proto; 475 sk->sk_protocol = proto;
476 sk->sk_state = IUCV_OPEN; 476 sk->sk_state = IUCV_OPEN;
477 477
478 setup_timer(&sk->sk_timer, iucv_sock_timeout, (unsigned long)sk); 478 setup_timer(&sk->sk_timer, iucv_sock_timeout, (unsigned long)sk);
479 479
480 iucv_sock_link(&iucv_sk_list, sk); 480 iucv_sock_link(&iucv_sk_list, sk);
481 return sk; 481 return sk;
482 } 482 }
483 483
484 /* Create an IUCV socket */ 484 /* Create an IUCV socket */
485 static int iucv_sock_create(struct net *net, struct socket *sock, int protocol) 485 static int iucv_sock_create(struct net *net, struct socket *sock, int protocol)
486 { 486 {
487 struct sock *sk; 487 struct sock *sk;
488 488
489 if (protocol && protocol != PF_IUCV) 489 if (protocol && protocol != PF_IUCV)
490 return -EPROTONOSUPPORT; 490 return -EPROTONOSUPPORT;
491 491
492 sock->state = SS_UNCONNECTED; 492 sock->state = SS_UNCONNECTED;
493 493
494 switch (sock->type) { 494 switch (sock->type) {
495 case SOCK_STREAM: 495 case SOCK_STREAM:
496 sock->ops = &iucv_sock_ops; 496 sock->ops = &iucv_sock_ops;
497 break; 497 break;
498 case SOCK_SEQPACKET: 498 case SOCK_SEQPACKET:
499 /* currently, proto ops can handle both sk types */ 499 /* currently, proto ops can handle both sk types */
500 sock->ops = &iucv_sock_ops; 500 sock->ops = &iucv_sock_ops;
501 break; 501 break;
502 default: 502 default:
503 return -ESOCKTNOSUPPORT; 503 return -ESOCKTNOSUPPORT;
504 } 504 }
505 505
506 sk = iucv_sock_alloc(sock, protocol, GFP_KERNEL); 506 sk = iucv_sock_alloc(sock, protocol, GFP_KERNEL);
507 if (!sk) 507 if (!sk)
508 return -ENOMEM; 508 return -ENOMEM;
509 509
510 iucv_sock_init(sk, NULL); 510 iucv_sock_init(sk, NULL);
511 511
512 return 0; 512 return 0;
513 } 513 }
514 514
515 void iucv_sock_link(struct iucv_sock_list *l, struct sock *sk) 515 void iucv_sock_link(struct iucv_sock_list *l, struct sock *sk)
516 { 516 {
517 write_lock_bh(&l->lock); 517 write_lock_bh(&l->lock);
518 sk_add_node(sk, &l->head); 518 sk_add_node(sk, &l->head);
519 write_unlock_bh(&l->lock); 519 write_unlock_bh(&l->lock);
520 } 520 }
521 521
522 void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *sk) 522 void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *sk)
523 { 523 {
524 write_lock_bh(&l->lock); 524 write_lock_bh(&l->lock);
525 sk_del_node_init(sk); 525 sk_del_node_init(sk);
526 write_unlock_bh(&l->lock); 526 write_unlock_bh(&l->lock);
527 } 527 }
528 528
529 void iucv_accept_enqueue(struct sock *parent, struct sock *sk) 529 void iucv_accept_enqueue(struct sock *parent, struct sock *sk)
530 { 530 {
531 unsigned long flags; 531 unsigned long flags;
532 struct iucv_sock *par = iucv_sk(parent); 532 struct iucv_sock *par = iucv_sk(parent);
533 533
534 sock_hold(sk); 534 sock_hold(sk);
535 spin_lock_irqsave(&par->accept_q_lock, flags); 535 spin_lock_irqsave(&par->accept_q_lock, flags);
536 list_add_tail(&iucv_sk(sk)->accept_q, &par->accept_q); 536 list_add_tail(&iucv_sk(sk)->accept_q, &par->accept_q);
537 spin_unlock_irqrestore(&par->accept_q_lock, flags); 537 spin_unlock_irqrestore(&par->accept_q_lock, flags);
538 iucv_sk(sk)->parent = parent; 538 iucv_sk(sk)->parent = parent;
539 parent->sk_ack_backlog++; 539 parent->sk_ack_backlog++;
540 } 540 }
541 541
542 void iucv_accept_unlink(struct sock *sk) 542 void iucv_accept_unlink(struct sock *sk)
543 { 543 {
544 unsigned long flags; 544 unsigned long flags;
545 struct iucv_sock *par = iucv_sk(iucv_sk(sk)->parent); 545 struct iucv_sock *par = iucv_sk(iucv_sk(sk)->parent);
546 546
547 spin_lock_irqsave(&par->accept_q_lock, flags); 547 spin_lock_irqsave(&par->accept_q_lock, flags);
548 list_del_init(&iucv_sk(sk)->accept_q); 548 list_del_init(&iucv_sk(sk)->accept_q);
549 spin_unlock_irqrestore(&par->accept_q_lock, flags); 549 spin_unlock_irqrestore(&par->accept_q_lock, flags);
550 iucv_sk(sk)->parent->sk_ack_backlog--; 550 iucv_sk(sk)->parent->sk_ack_backlog--;
551 iucv_sk(sk)->parent = NULL; 551 iucv_sk(sk)->parent = NULL;
552 sock_put(sk); 552 sock_put(sk);
553 } 553 }
554 554
555 struct sock *iucv_accept_dequeue(struct sock *parent, struct socket *newsock) 555 struct sock *iucv_accept_dequeue(struct sock *parent, struct socket *newsock)
556 { 556 {
557 struct iucv_sock *isk, *n; 557 struct iucv_sock *isk, *n;
558 struct sock *sk; 558 struct sock *sk;
559 559
560 list_for_each_entry_safe(isk, n, &iucv_sk(parent)->accept_q, accept_q) { 560 list_for_each_entry_safe(isk, n, &iucv_sk(parent)->accept_q, accept_q) {
561 sk = (struct sock *) isk; 561 sk = (struct sock *) isk;
562 lock_sock(sk); 562 lock_sock(sk);
563 563
564 if (sk->sk_state == IUCV_CLOSED) { 564 if (sk->sk_state == IUCV_CLOSED) {
565 iucv_accept_unlink(sk); 565 iucv_accept_unlink(sk);
566 release_sock(sk); 566 release_sock(sk);
567 continue; 567 continue;
568 } 568 }
569 569
570 if (sk->sk_state == IUCV_CONNECTED || 570 if (sk->sk_state == IUCV_CONNECTED ||
571 sk->sk_state == IUCV_SEVERED || 571 sk->sk_state == IUCV_SEVERED ||
572 !newsock) { 572 !newsock) {
573 iucv_accept_unlink(sk); 573 iucv_accept_unlink(sk);
574 if (newsock) 574 if (newsock)
575 sock_graft(sk, newsock); 575 sock_graft(sk, newsock);
576 576
577 if (sk->sk_state == IUCV_SEVERED) 577 if (sk->sk_state == IUCV_SEVERED)
578 sk->sk_state = IUCV_DISCONN; 578 sk->sk_state = IUCV_DISCONN;
579 579
580 release_sock(sk); 580 release_sock(sk);
581 return sk; 581 return sk;
582 } 582 }
583 583
584 release_sock(sk); 584 release_sock(sk);
585 } 585 }
586 return NULL; 586 return NULL;
587 } 587 }
588 588
589 /* Bind an unbound socket */ 589 /* Bind an unbound socket */
590 static int iucv_sock_bind(struct socket *sock, struct sockaddr *addr, 590 static int iucv_sock_bind(struct socket *sock, struct sockaddr *addr,
591 int addr_len) 591 int addr_len)
592 { 592 {
593 struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr; 593 struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr;
594 struct sock *sk = sock->sk; 594 struct sock *sk = sock->sk;
595 struct iucv_sock *iucv; 595 struct iucv_sock *iucv;
596 int err; 596 int err;
597 597
598 /* Verify the input sockaddr */ 598 /* Verify the input sockaddr */
599 if (!addr || addr->sa_family != AF_IUCV) 599 if (!addr || addr->sa_family != AF_IUCV)
600 return -EINVAL; 600 return -EINVAL;
601 601
602 lock_sock(sk); 602 lock_sock(sk);
603 if (sk->sk_state != IUCV_OPEN) { 603 if (sk->sk_state != IUCV_OPEN) {
604 err = -EBADFD; 604 err = -EBADFD;
605 goto done; 605 goto done;
606 } 606 }
607 607
608 write_lock_bh(&iucv_sk_list.lock); 608 write_lock_bh(&iucv_sk_list.lock);
609 609
610 iucv = iucv_sk(sk); 610 iucv = iucv_sk(sk);
611 if (__iucv_get_sock_by_name(sa->siucv_name)) { 611 if (__iucv_get_sock_by_name(sa->siucv_name)) {
612 err = -EADDRINUSE; 612 err = -EADDRINUSE;
613 goto done_unlock; 613 goto done_unlock;
614 } 614 }
615 if (iucv->path) { 615 if (iucv->path) {
616 err = 0; 616 err = 0;
617 goto done_unlock; 617 goto done_unlock;
618 } 618 }
619 619
620 /* Bind the socket */ 620 /* Bind the socket */
621 memcpy(iucv->src_name, sa->siucv_name, 8); 621 memcpy(iucv->src_name, sa->siucv_name, 8);
622 622
623 /* Copy the user id */ 623 /* Copy the user id */
624 memcpy(iucv->src_user_id, iucv_userid, 8); 624 memcpy(iucv->src_user_id, iucv_userid, 8);
625 sk->sk_state = IUCV_BOUND; 625 sk->sk_state = IUCV_BOUND;
626 err = 0; 626 err = 0;
627 627
628 done_unlock: 628 done_unlock:
629 /* Release the socket list lock */ 629 /* Release the socket list lock */
630 write_unlock_bh(&iucv_sk_list.lock); 630 write_unlock_bh(&iucv_sk_list.lock);
631 done: 631 done:
632 release_sock(sk); 632 release_sock(sk);
633 return err; 633 return err;
634 } 634 }
635 635
636 /* Automatically bind an unbound socket */ 636 /* Automatically bind an unbound socket */
637 static int iucv_sock_autobind(struct sock *sk) 637 static int iucv_sock_autobind(struct sock *sk)
638 { 638 {
639 struct iucv_sock *iucv = iucv_sk(sk); 639 struct iucv_sock *iucv = iucv_sk(sk);
640 char query_buffer[80]; 640 char query_buffer[80];
641 char name[12]; 641 char name[12];
642 int err = 0; 642 int err = 0;
643 643
644 /* Set the userid and name */ 644 /* Set the userid and name */
645 cpcmd("QUERY USERID", query_buffer, sizeof(query_buffer), &err); 645 cpcmd("QUERY USERID", query_buffer, sizeof(query_buffer), &err);
646 if (unlikely(err)) 646 if (unlikely(err))
647 return -EPROTO; 647 return -EPROTO;
648 648
649 memcpy(iucv->src_user_id, query_buffer, 8); 649 memcpy(iucv->src_user_id, query_buffer, 8);
650 650
651 write_lock_bh(&iucv_sk_list.lock); 651 write_lock_bh(&iucv_sk_list.lock);
652 652
653 sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name)); 653 sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
654 while (__iucv_get_sock_by_name(name)) { 654 while (__iucv_get_sock_by_name(name)) {
655 sprintf(name, "%08x", 655 sprintf(name, "%08x",
656 atomic_inc_return(&iucv_sk_list.autobind_name)); 656 atomic_inc_return(&iucv_sk_list.autobind_name));
657 } 657 }
658 658
659 write_unlock_bh(&iucv_sk_list.lock); 659 write_unlock_bh(&iucv_sk_list.lock);
660 660
661 memcpy(&iucv->src_name, name, 8); 661 memcpy(&iucv->src_name, name, 8);
662 662
663 return err; 663 return err;
664 } 664 }
665 665
666 /* Connect an unconnected socket */ 666 /* Connect an unconnected socket */
667 static int iucv_sock_connect(struct socket *sock, struct sockaddr *addr, 667 static int iucv_sock_connect(struct socket *sock, struct sockaddr *addr,
668 int alen, int flags) 668 int alen, int flags)
669 { 669 {
670 struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr; 670 struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr;
671 struct sock *sk = sock->sk; 671 struct sock *sk = sock->sk;
672 struct iucv_sock *iucv; 672 struct iucv_sock *iucv;
673 unsigned char user_data[16]; 673 unsigned char user_data[16];
674 int err; 674 int err;
675 675
676 if (addr->sa_family != AF_IUCV || alen < sizeof(struct sockaddr_iucv)) 676 if (addr->sa_family != AF_IUCV || alen < sizeof(struct sockaddr_iucv))
677 return -EINVAL; 677 return -EINVAL;
678 678
679 if (sk->sk_state != IUCV_OPEN && sk->sk_state != IUCV_BOUND) 679 if (sk->sk_state != IUCV_OPEN && sk->sk_state != IUCV_BOUND)
680 return -EBADFD; 680 return -EBADFD;
681 681
682 if (sk->sk_type != SOCK_STREAM && sk->sk_type != SOCK_SEQPACKET) 682 if (sk->sk_type != SOCK_STREAM && sk->sk_type != SOCK_SEQPACKET)
683 return -EINVAL; 683 return -EINVAL;
684 684
685 if (sk->sk_state == IUCV_OPEN) { 685 if (sk->sk_state == IUCV_OPEN) {
686 err = iucv_sock_autobind(sk); 686 err = iucv_sock_autobind(sk);
687 if (unlikely(err)) 687 if (unlikely(err))
688 return err; 688 return err;
689 } 689 }
690 690
691 lock_sock(sk); 691 lock_sock(sk);
692 692
693 /* Set the destination information */ 693 /* Set the destination information */
694 memcpy(iucv_sk(sk)->dst_user_id, sa->siucv_user_id, 8); 694 memcpy(iucv_sk(sk)->dst_user_id, sa->siucv_user_id, 8);
695 memcpy(iucv_sk(sk)->dst_name, sa->siucv_name, 8); 695 memcpy(iucv_sk(sk)->dst_name, sa->siucv_name, 8);
696 696
697 high_nmcpy(user_data, sa->siucv_name); 697 high_nmcpy(user_data, sa->siucv_name);
698 low_nmcpy(user_data, iucv_sk(sk)->src_name); 698 low_nmcpy(user_data, iucv_sk(sk)->src_name);
699 ASCEBC(user_data, sizeof(user_data)); 699 ASCEBC(user_data, sizeof(user_data));
700 700
701 iucv = iucv_sk(sk); 701 iucv = iucv_sk(sk);
702 /* Create path. */ 702 /* Create path. */
703 iucv->path = iucv_path_alloc(iucv->msglimit, 703 iucv->path = iucv_path_alloc(iucv->msglimit,
704 IUCV_IPRMDATA, GFP_KERNEL); 704 IUCV_IPRMDATA, GFP_KERNEL);
705 if (!iucv->path) { 705 if (!iucv->path) {
706 err = -ENOMEM; 706 err = -ENOMEM;
707 goto done; 707 goto done;
708 } 708 }
709 err = iucv_path_connect(iucv->path, &af_iucv_handler, 709 err = iucv_path_connect(iucv->path, &af_iucv_handler,
710 sa->siucv_user_id, NULL, user_data, sk); 710 sa->siucv_user_id, NULL, user_data, sk);
711 if (err) { 711 if (err) {
712 iucv_path_free(iucv->path); 712 iucv_path_free(iucv->path);
713 iucv->path = NULL; 713 iucv->path = NULL;
714 switch (err) { 714 switch (err) {
715 case 0x0b: /* Target communicator is not logged on */ 715 case 0x0b: /* Target communicator is not logged on */
716 err = -ENETUNREACH; 716 err = -ENETUNREACH;
717 break; 717 break;
718 case 0x0d: /* Max connections for this guest exceeded */ 718 case 0x0d: /* Max connections for this guest exceeded */
719 case 0x0e: /* Max connections for target guest exceeded */ 719 case 0x0e: /* Max connections for target guest exceeded */
720 err = -EAGAIN; 720 err = -EAGAIN;
721 break; 721 break;
722 case 0x0f: /* Missing IUCV authorization */ 722 case 0x0f: /* Missing IUCV authorization */
723 err = -EACCES; 723 err = -EACCES;
724 break; 724 break;
725 default: 725 default:
726 err = -ECONNREFUSED; 726 err = -ECONNREFUSED;
727 break; 727 break;
728 } 728 }
729 goto done; 729 goto done;
730 } 730 }
731 731
732 if (sk->sk_state != IUCV_CONNECTED) { 732 if (sk->sk_state != IUCV_CONNECTED) {
733 err = iucv_sock_wait(sk, iucv_sock_in_state(sk, IUCV_CONNECTED, 733 err = iucv_sock_wait(sk, iucv_sock_in_state(sk, IUCV_CONNECTED,
734 IUCV_DISCONN), 734 IUCV_DISCONN),
735 sock_sndtimeo(sk, flags & O_NONBLOCK)); 735 sock_sndtimeo(sk, flags & O_NONBLOCK));
736 } 736 }
737 737
738 if (sk->sk_state == IUCV_DISCONN) { 738 if (sk->sk_state == IUCV_DISCONN) {
739 err = -ECONNREFUSED; 739 err = -ECONNREFUSED;
740 } 740 }
741 741
742 if (err) { 742 if (err) {
743 iucv_path_sever(iucv->path, NULL); 743 iucv_path_sever(iucv->path, NULL);
744 iucv_path_free(iucv->path); 744 iucv_path_free(iucv->path);
745 iucv->path = NULL; 745 iucv->path = NULL;
746 } 746 }
747 747
748 done: 748 done:
749 release_sock(sk); 749 release_sock(sk);
750 return err; 750 return err;
751 } 751 }
752 752
753 /* Move a socket into listening state. */ 753 /* Move a socket into listening state. */
754 static int iucv_sock_listen(struct socket *sock, int backlog) 754 static int iucv_sock_listen(struct socket *sock, int backlog)
755 { 755 {
756 struct sock *sk = sock->sk; 756 struct sock *sk = sock->sk;
757 int err; 757 int err;
758 758
759 lock_sock(sk); 759 lock_sock(sk);
760 760
761 err = -EINVAL; 761 err = -EINVAL;
762 if (sk->sk_state != IUCV_BOUND) 762 if (sk->sk_state != IUCV_BOUND)
763 goto done; 763 goto done;
764 764
765 if (sock->type != SOCK_STREAM && sock->type != SOCK_SEQPACKET) 765 if (sock->type != SOCK_STREAM && sock->type != SOCK_SEQPACKET)
766 goto done; 766 goto done;
767 767
768 sk->sk_max_ack_backlog = backlog; 768 sk->sk_max_ack_backlog = backlog;
769 sk->sk_ack_backlog = 0; 769 sk->sk_ack_backlog = 0;
770 sk->sk_state = IUCV_LISTEN; 770 sk->sk_state = IUCV_LISTEN;
771 err = 0; 771 err = 0;
772 772
773 done: 773 done:
774 release_sock(sk); 774 release_sock(sk);
775 return err; 775 return err;
776 } 776 }
777 777
778 /* Accept a pending connection */ 778 /* Accept a pending connection */
779 static int iucv_sock_accept(struct socket *sock, struct socket *newsock, 779 static int iucv_sock_accept(struct socket *sock, struct socket *newsock,
780 int flags) 780 int flags)
781 { 781 {
782 DECLARE_WAITQUEUE(wait, current); 782 DECLARE_WAITQUEUE(wait, current);
783 struct sock *sk = sock->sk, *nsk; 783 struct sock *sk = sock->sk, *nsk;
784 long timeo; 784 long timeo;
785 int err = 0; 785 int err = 0;
786 786
787 lock_sock_nested(sk, SINGLE_DEPTH_NESTING); 787 lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
788 788
789 if (sk->sk_state != IUCV_LISTEN) { 789 if (sk->sk_state != IUCV_LISTEN) {
790 err = -EBADFD; 790 err = -EBADFD;
791 goto done; 791 goto done;
792 } 792 }
793 793
794 timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK); 794 timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
795 795
796 /* Wait for an incoming connection */ 796 /* Wait for an incoming connection */
797 add_wait_queue_exclusive(sk->sk_sleep, &wait); 797 add_wait_queue_exclusive(sk->sk_sleep, &wait);
798 while (!(nsk = iucv_accept_dequeue(sk, newsock))) { 798 while (!(nsk = iucv_accept_dequeue(sk, newsock))) {
799 set_current_state(TASK_INTERRUPTIBLE); 799 set_current_state(TASK_INTERRUPTIBLE);
800 if (!timeo) { 800 if (!timeo) {
801 err = -EAGAIN; 801 err = -EAGAIN;
802 break; 802 break;
803 } 803 }
804 804
805 release_sock(sk); 805 release_sock(sk);
806 timeo = schedule_timeout(timeo); 806 timeo = schedule_timeout(timeo);
807 lock_sock_nested(sk, SINGLE_DEPTH_NESTING); 807 lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
808 808
809 if (sk->sk_state != IUCV_LISTEN) { 809 if (sk->sk_state != IUCV_LISTEN) {
810 err = -EBADFD; 810 err = -EBADFD;
811 break; 811 break;
812 } 812 }
813 813
814 if (signal_pending(current)) { 814 if (signal_pending(current)) {
815 err = sock_intr_errno(timeo); 815 err = sock_intr_errno(timeo);
816 break; 816 break;
817 } 817 }
818 } 818 }
819 819
820 set_current_state(TASK_RUNNING); 820 set_current_state(TASK_RUNNING);
821 remove_wait_queue(sk->sk_sleep, &wait); 821 remove_wait_queue(sk->sk_sleep, &wait);
822 822
823 if (err) 823 if (err)
824 goto done; 824 goto done;
825 825
826 newsock->state = SS_CONNECTED; 826 newsock->state = SS_CONNECTED;
827 827
828 done: 828 done:
829 release_sock(sk); 829 release_sock(sk);
830 return err; 830 return err;
831 } 831 }
832 832
833 static int iucv_sock_getname(struct socket *sock, struct sockaddr *addr, 833 static int iucv_sock_getname(struct socket *sock, struct sockaddr *addr,
834 int *len, int peer) 834 int *len, int peer)
835 { 835 {
836 struct sockaddr_iucv *siucv = (struct sockaddr_iucv *) addr; 836 struct sockaddr_iucv *siucv = (struct sockaddr_iucv *) addr;
837 struct sock *sk = sock->sk; 837 struct sock *sk = sock->sk;
838 838
839 addr->sa_family = AF_IUCV; 839 addr->sa_family = AF_IUCV;
840 *len = sizeof(struct sockaddr_iucv); 840 *len = sizeof(struct sockaddr_iucv);
841 841
842 if (peer) { 842 if (peer) {
843 memcpy(siucv->siucv_user_id, iucv_sk(sk)->dst_user_id, 8); 843 memcpy(siucv->siucv_user_id, iucv_sk(sk)->dst_user_id, 8);
844 memcpy(siucv->siucv_name, &iucv_sk(sk)->dst_name, 8); 844 memcpy(siucv->siucv_name, &iucv_sk(sk)->dst_name, 8);
845 } else { 845 } else {
846 memcpy(siucv->siucv_user_id, iucv_sk(sk)->src_user_id, 8); 846 memcpy(siucv->siucv_user_id, iucv_sk(sk)->src_user_id, 8);
847 memcpy(siucv->siucv_name, iucv_sk(sk)->src_name, 8); 847 memcpy(siucv->siucv_name, iucv_sk(sk)->src_name, 8);
848 } 848 }
849 memset(&siucv->siucv_port, 0, sizeof(siucv->siucv_port)); 849 memset(&siucv->siucv_port, 0, sizeof(siucv->siucv_port));
850 memset(&siucv->siucv_addr, 0, sizeof(siucv->siucv_addr)); 850 memset(&siucv->siucv_addr, 0, sizeof(siucv->siucv_addr));
851 memset(siucv->siucv_nodeid, 0, sizeof(siucv->siucv_nodeid)); 851 memset(siucv->siucv_nodeid, 0, sizeof(siucv->siucv_nodeid));
852 852
853 return 0; 853 return 0;
854 } 854 }
855 855
856 /** 856 /**
857 * iucv_send_iprm() - Send socket data in parameter list of an iucv message. 857 * iucv_send_iprm() - Send socket data in parameter list of an iucv message.
858 * @path: IUCV path 858 * @path: IUCV path
859 * @msg: Pointer to a struct iucv_message 859 * @msg: Pointer to a struct iucv_message
860 * @skb: The socket data to send, skb->len MUST BE <= 7 860 * @skb: The socket data to send, skb->len MUST BE <= 7
861 * 861 *
862 * Send the socket data in the parameter list in the iucv message 862 * Send the socket data in the parameter list in the iucv message
863 * (IUCV_IPRMDATA). The socket data is stored at index 0 to 6 in the parameter 863 * (IUCV_IPRMDATA). The socket data is stored at index 0 to 6 in the parameter
864 * list and the socket data len at index 7 (last byte). 864 * list and the socket data len at index 7 (last byte).
865 * See also iucv_msg_length(). 865 * See also iucv_msg_length().
866 * 866 *
867 * Returns the error code from the iucv_message_send() call. 867 * Returns the error code from the iucv_message_send() call.
868 */ 868 */
869 static int iucv_send_iprm(struct iucv_path *path, struct iucv_message *msg, 869 static int iucv_send_iprm(struct iucv_path *path, struct iucv_message *msg,
870 struct sk_buff *skb) 870 struct sk_buff *skb)
871 { 871 {
872 u8 prmdata[8]; 872 u8 prmdata[8];
873 873
874 memcpy(prmdata, (void *) skb->data, skb->len); 874 memcpy(prmdata, (void *) skb->data, skb->len);
875 prmdata[7] = 0xff - (u8) skb->len; 875 prmdata[7] = 0xff - (u8) skb->len;
876 return iucv_message_send(path, msg, IUCV_IPRMDATA, 0, 876 return iucv_message_send(path, msg, IUCV_IPRMDATA, 0,
877 (void *) prmdata, 8); 877 (void *) prmdata, 8);
878 } 878 }
879 879
880 static int iucv_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 880 static int iucv_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
881 struct msghdr *msg, size_t len) 881 struct msghdr *msg, size_t len)
882 { 882 {
883 struct sock *sk = sock->sk; 883 struct sock *sk = sock->sk;
884 struct iucv_sock *iucv = iucv_sk(sk); 884 struct iucv_sock *iucv = iucv_sk(sk);
885 struct sk_buff *skb; 885 struct sk_buff *skb;
886 struct iucv_message txmsg; 886 struct iucv_message txmsg;
887 struct cmsghdr *cmsg; 887 struct cmsghdr *cmsg;
888 int cmsg_done; 888 int cmsg_done;
889 long timeo; 889 long timeo;
890 char user_id[9]; 890 char user_id[9];
891 char appl_id[9]; 891 char appl_id[9];
892 int err; 892 int err;
893 int noblock = msg->msg_flags & MSG_DONTWAIT; 893 int noblock = msg->msg_flags & MSG_DONTWAIT;
894 894
895 err = sock_error(sk); 895 err = sock_error(sk);
896 if (err) 896 if (err)
897 return err; 897 return err;
898 898
899 if (msg->msg_flags & MSG_OOB) 899 if (msg->msg_flags & MSG_OOB)
900 return -EOPNOTSUPP; 900 return -EOPNOTSUPP;
901 901
902 /* SOCK_SEQPACKET: we do not support segmented records */ 902 /* SOCK_SEQPACKET: we do not support segmented records */
903 if (sk->sk_type == SOCK_SEQPACKET && !(msg->msg_flags & MSG_EOR)) 903 if (sk->sk_type == SOCK_SEQPACKET && !(msg->msg_flags & MSG_EOR))
904 return -EOPNOTSUPP; 904 return -EOPNOTSUPP;
905 905
906 lock_sock(sk); 906 lock_sock(sk);
907 907
908 if (sk->sk_shutdown & SEND_SHUTDOWN) { 908 if (sk->sk_shutdown & SEND_SHUTDOWN) {
909 err = -EPIPE; 909 err = -EPIPE;
910 goto out; 910 goto out;
911 } 911 }
912 912
913 /* Return if the socket is not in connected state */ 913 /* Return if the socket is not in connected state */
914 if (sk->sk_state != IUCV_CONNECTED) { 914 if (sk->sk_state != IUCV_CONNECTED) {
915 err = -ENOTCONN; 915 err = -ENOTCONN;
916 goto out; 916 goto out;
917 } 917 }
918 918
919 /* initialize defaults */ 919 /* initialize defaults */
920 cmsg_done = 0; /* check for duplicate headers */ 920 cmsg_done = 0; /* check for duplicate headers */
921 txmsg.class = 0; 921 txmsg.class = 0;
922 922
923 /* iterate over control messages */ 923 /* iterate over control messages */
924 for (cmsg = CMSG_FIRSTHDR(msg); cmsg; 924 for (cmsg = CMSG_FIRSTHDR(msg); cmsg;
925 cmsg = CMSG_NXTHDR(msg, cmsg)) { 925 cmsg = CMSG_NXTHDR(msg, cmsg)) {
926 926
927 if (!CMSG_OK(msg, cmsg)) { 927 if (!CMSG_OK(msg, cmsg)) {
928 err = -EINVAL; 928 err = -EINVAL;
929 goto out; 929 goto out;
930 } 930 }
931 931
932 if (cmsg->cmsg_level != SOL_IUCV) 932 if (cmsg->cmsg_level != SOL_IUCV)
933 continue; 933 continue;
934 934
935 if (cmsg->cmsg_type & cmsg_done) { 935 if (cmsg->cmsg_type & cmsg_done) {
936 err = -EINVAL; 936 err = -EINVAL;
937 goto out; 937 goto out;
938 } 938 }
939 cmsg_done |= cmsg->cmsg_type; 939 cmsg_done |= cmsg->cmsg_type;
940 940
941 switch (cmsg->cmsg_type) { 941 switch (cmsg->cmsg_type) {
942 case SCM_IUCV_TRGCLS: 942 case SCM_IUCV_TRGCLS:
943 if (cmsg->cmsg_len != CMSG_LEN(TRGCLS_SIZE)) { 943 if (cmsg->cmsg_len != CMSG_LEN(TRGCLS_SIZE)) {
944 err = -EINVAL; 944 err = -EINVAL;
945 goto out; 945 goto out;
946 } 946 }
947 947
948 /* set iucv message target class */ 948 /* set iucv message target class */
949 memcpy(&txmsg.class, 949 memcpy(&txmsg.class,
950 (void *) CMSG_DATA(cmsg), TRGCLS_SIZE); 950 (void *) CMSG_DATA(cmsg), TRGCLS_SIZE);
951 951
952 break; 952 break;
953 953
954 default: 954 default:
955 err = -EINVAL; 955 err = -EINVAL;
956 goto out; 956 goto out;
957 break; 957 break;
958 } 958 }
959 } 959 }
960 960
961 /* allocate one skb for each iucv message: 961 /* allocate one skb for each iucv message:
962 * this is fine for SOCK_SEQPACKET (unless we want to support 962 * this is fine for SOCK_SEQPACKET (unless we want to support
963 * segmented records using the MSG_EOR flag), but 963 * segmented records using the MSG_EOR flag), but
964 * for SOCK_STREAM we might want to improve it in future */ 964 * for SOCK_STREAM we might want to improve it in future */
965 skb = sock_alloc_send_skb(sk, len, noblock, &err); 965 skb = sock_alloc_send_skb(sk, len, noblock, &err);
966 if (!skb) 966 if (!skb)
967 goto out; 967 goto out;
968 if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) { 968 if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
969 err = -EFAULT; 969 err = -EFAULT;
970 goto fail; 970 goto fail;
971 } 971 }
972 972
973 /* wait if outstanding messages for iucv path has reached */ 973 /* wait if outstanding messages for iucv path has reached */
974 timeo = sock_sndtimeo(sk, noblock); 974 timeo = sock_sndtimeo(sk, noblock);
975 err = iucv_sock_wait(sk, iucv_below_msglim(sk), timeo); 975 err = iucv_sock_wait(sk, iucv_below_msglim(sk), timeo);
976 if (err) 976 if (err)
977 goto fail; 977 goto fail;
978 978
979 /* return -ECONNRESET if the socket is no longer connected */ 979 /* return -ECONNRESET if the socket is no longer connected */
980 if (sk->sk_state != IUCV_CONNECTED) { 980 if (sk->sk_state != IUCV_CONNECTED) {
981 err = -ECONNRESET; 981 err = -ECONNRESET;
982 goto fail; 982 goto fail;
983 } 983 }
984 984
985 /* increment and save iucv message tag for msg_completion cbk */ 985 /* increment and save iucv message tag for msg_completion cbk */
986 txmsg.tag = iucv->send_tag++; 986 txmsg.tag = iucv->send_tag++;
987 memcpy(CB_TAG(skb), &txmsg.tag, CB_TAG_LEN); 987 memcpy(CB_TAG(skb), &txmsg.tag, CB_TAG_LEN);
988 skb_queue_tail(&iucv->send_skb_q, skb); 988 skb_queue_tail(&iucv->send_skb_q, skb);
989 989
990 if (((iucv->path->flags & IUCV_IPRMDATA) & iucv->flags) 990 if (((iucv->path->flags & IUCV_IPRMDATA) & iucv->flags)
991 && skb->len <= 7) { 991 && skb->len <= 7) {
992 err = iucv_send_iprm(iucv->path, &txmsg, skb); 992 err = iucv_send_iprm(iucv->path, &txmsg, skb);
993 993
994 /* on success: there is no message_complete callback 994 /* on success: there is no message_complete callback
995 * for an IPRMDATA msg; remove skb from send queue */ 995 * for an IPRMDATA msg; remove skb from send queue */
996 if (err == 0) { 996 if (err == 0) {
997 skb_unlink(skb, &iucv->send_skb_q); 997 skb_unlink(skb, &iucv->send_skb_q);
998 kfree_skb(skb); 998 kfree_skb(skb);
999 } 999 }
1000 1000
1001 /* this error should never happen since the 1001 /* this error should never happen since the
1002 * IUCV_IPRMDATA path flag is set... sever path */ 1002 * IUCV_IPRMDATA path flag is set... sever path */
1003 if (err == 0x15) { 1003 if (err == 0x15) {
1004 iucv_path_sever(iucv->path, NULL); 1004 iucv_path_sever(iucv->path, NULL);
1005 skb_unlink(skb, &iucv->send_skb_q); 1005 skb_unlink(skb, &iucv->send_skb_q);
1006 err = -EPIPE; 1006 err = -EPIPE;
1007 goto fail; 1007 goto fail;
1008 } 1008 }
1009 } else 1009 } else
1010 err = iucv_message_send(iucv->path, &txmsg, 0, 0, 1010 err = iucv_message_send(iucv->path, &txmsg, 0, 0,
1011 (void *) skb->data, skb->len); 1011 (void *) skb->data, skb->len);
1012 if (err) { 1012 if (err) {
1013 if (err == 3) { 1013 if (err == 3) {
1014 user_id[8] = 0; 1014 user_id[8] = 0;
1015 memcpy(user_id, iucv->dst_user_id, 8); 1015 memcpy(user_id, iucv->dst_user_id, 8);
1016 appl_id[8] = 0; 1016 appl_id[8] = 0;
1017 memcpy(appl_id, iucv->dst_name, 8); 1017 memcpy(appl_id, iucv->dst_name, 8);
1018 pr_err("Application %s on z/VM guest %s" 1018 pr_err("Application %s on z/VM guest %s"
1019 " exceeds message limit\n", 1019 " exceeds message limit\n",
1020 appl_id, user_id); 1020 appl_id, user_id);
1021 err = -EAGAIN; 1021 err = -EAGAIN;
1022 } else 1022 } else
1023 err = -EPIPE; 1023 err = -EPIPE;
1024 skb_unlink(skb, &iucv->send_skb_q); 1024 skb_unlink(skb, &iucv->send_skb_q);
1025 goto fail; 1025 goto fail;
1026 } 1026 }
1027 1027
1028 release_sock(sk); 1028 release_sock(sk);
1029 return len; 1029 return len;
1030 1030
1031 fail: 1031 fail:
1032 kfree_skb(skb); 1032 kfree_skb(skb);
1033 out: 1033 out:
1034 release_sock(sk); 1034 release_sock(sk);
1035 return err; 1035 return err;
1036 } 1036 }
1037 1037
1038 static int iucv_fragment_skb(struct sock *sk, struct sk_buff *skb, int len) 1038 static int iucv_fragment_skb(struct sock *sk, struct sk_buff *skb, int len)
1039 { 1039 {
1040 int dataleft, size, copied = 0; 1040 int dataleft, size, copied = 0;
1041 struct sk_buff *nskb; 1041 struct sk_buff *nskb;
1042 1042
1043 dataleft = len; 1043 dataleft = len;
1044 while (dataleft) { 1044 while (dataleft) {
1045 if (dataleft >= sk->sk_rcvbuf / 4) 1045 if (dataleft >= sk->sk_rcvbuf / 4)
1046 size = sk->sk_rcvbuf / 4; 1046 size = sk->sk_rcvbuf / 4;
1047 else 1047 else
1048 size = dataleft; 1048 size = dataleft;
1049 1049
1050 nskb = alloc_skb(size, GFP_ATOMIC | GFP_DMA); 1050 nskb = alloc_skb(size, GFP_ATOMIC | GFP_DMA);
1051 if (!nskb) 1051 if (!nskb)
1052 return -ENOMEM; 1052 return -ENOMEM;
1053 1053
1054 /* copy target class to control buffer of new skb */ 1054 /* copy target class to control buffer of new skb */
1055 memcpy(CB_TRGCLS(nskb), CB_TRGCLS(skb), CB_TRGCLS_LEN); 1055 memcpy(CB_TRGCLS(nskb), CB_TRGCLS(skb), CB_TRGCLS_LEN);
1056 1056
1057 /* copy data fragment */ 1057 /* copy data fragment */
1058 memcpy(nskb->data, skb->data + copied, size); 1058 memcpy(nskb->data, skb->data + copied, size);
1059 copied += size; 1059 copied += size;
1060 dataleft -= size; 1060 dataleft -= size;
1061 1061
1062 skb_reset_transport_header(nskb); 1062 skb_reset_transport_header(nskb);
1063 skb_reset_network_header(nskb); 1063 skb_reset_network_header(nskb);
1064 nskb->len = size; 1064 nskb->len = size;
1065 1065
1066 skb_queue_tail(&iucv_sk(sk)->backlog_skb_q, nskb); 1066 skb_queue_tail(&iucv_sk(sk)->backlog_skb_q, nskb);
1067 } 1067 }
1068 1068
1069 return 0; 1069 return 0;
1070 } 1070 }
1071 1071
1072 static void iucv_process_message(struct sock *sk, struct sk_buff *skb, 1072 static void iucv_process_message(struct sock *sk, struct sk_buff *skb,
1073 struct iucv_path *path, 1073 struct iucv_path *path,
1074 struct iucv_message *msg) 1074 struct iucv_message *msg)
1075 { 1075 {
1076 int rc; 1076 int rc;
1077 unsigned int len; 1077 unsigned int len;
1078 1078
1079 len = iucv_msg_length(msg); 1079 len = iucv_msg_length(msg);
1080 1080
1081 /* store msg target class in the second 4 bytes of skb ctrl buffer */ 1081 /* store msg target class in the second 4 bytes of skb ctrl buffer */
1082 /* Note: the first 4 bytes are reserved for msg tag */ 1082 /* Note: the first 4 bytes are reserved for msg tag */
1083 memcpy(CB_TRGCLS(skb), &msg->class, CB_TRGCLS_LEN); 1083 memcpy(CB_TRGCLS(skb), &msg->class, CB_TRGCLS_LEN);
1084 1084
1085 /* check for special IPRM messages (e.g. iucv_sock_shutdown) */ 1085 /* check for special IPRM messages (e.g. iucv_sock_shutdown) */
1086 if ((msg->flags & IUCV_IPRMDATA) && len > 7) { 1086 if ((msg->flags & IUCV_IPRMDATA) && len > 7) {
1087 if (memcmp(msg->rmmsg, iprm_shutdown, 8) == 0) { 1087 if (memcmp(msg->rmmsg, iprm_shutdown, 8) == 0) {
1088 skb->data = NULL; 1088 skb->data = NULL;
1089 skb->len = 0; 1089 skb->len = 0;
1090 } 1090 }
1091 } else { 1091 } else {
1092 rc = iucv_message_receive(path, msg, msg->flags & IUCV_IPRMDATA, 1092 rc = iucv_message_receive(path, msg, msg->flags & IUCV_IPRMDATA,
1093 skb->data, len, NULL); 1093 skb->data, len, NULL);
1094 if (rc) { 1094 if (rc) {
1095 kfree_skb(skb); 1095 kfree_skb(skb);
1096 return; 1096 return;
1097 } 1097 }
1098 /* we need to fragment iucv messages for SOCK_STREAM only; 1098 /* we need to fragment iucv messages for SOCK_STREAM only;
1099 * for SOCK_SEQPACKET, it is only relevant if we support 1099 * for SOCK_SEQPACKET, it is only relevant if we support
1100 * record segmentation using MSG_EOR (see also recvmsg()) */ 1100 * record segmentation using MSG_EOR (see also recvmsg()) */
1101 if (sk->sk_type == SOCK_STREAM && 1101 if (sk->sk_type == SOCK_STREAM &&
1102 skb->truesize >= sk->sk_rcvbuf / 4) { 1102 skb->truesize >= sk->sk_rcvbuf / 4) {
1103 rc = iucv_fragment_skb(sk, skb, len); 1103 rc = iucv_fragment_skb(sk, skb, len);
1104 kfree_skb(skb); 1104 kfree_skb(skb);
1105 skb = NULL; 1105 skb = NULL;
1106 if (rc) { 1106 if (rc) {
1107 iucv_path_sever(path, NULL); 1107 iucv_path_sever(path, NULL);
1108 return; 1108 return;
1109 } 1109 }
1110 skb = skb_dequeue(&iucv_sk(sk)->backlog_skb_q); 1110 skb = skb_dequeue(&iucv_sk(sk)->backlog_skb_q);
1111 } else { 1111 } else {
1112 skb_reset_transport_header(skb); 1112 skb_reset_transport_header(skb);
1113 skb_reset_network_header(skb); 1113 skb_reset_network_header(skb);
1114 skb->len = len; 1114 skb->len = len;
1115 } 1115 }
1116 } 1116 }
1117 1117
1118 if (sock_queue_rcv_skb(sk, skb)) 1118 if (sock_queue_rcv_skb(sk, skb))
1119 skb_queue_head(&iucv_sk(sk)->backlog_skb_q, skb); 1119 skb_queue_head(&iucv_sk(sk)->backlog_skb_q, skb);
1120 } 1120 }
1121 1121
1122 static void iucv_process_message_q(struct sock *sk) 1122 static void iucv_process_message_q(struct sock *sk)
1123 { 1123 {
1124 struct iucv_sock *iucv = iucv_sk(sk); 1124 struct iucv_sock *iucv = iucv_sk(sk);
1125 struct sk_buff *skb; 1125 struct sk_buff *skb;
1126 struct sock_msg_q *p, *n; 1126 struct sock_msg_q *p, *n;
1127 1127
1128 list_for_each_entry_safe(p, n, &iucv->message_q.list, list) { 1128 list_for_each_entry_safe(p, n, &iucv->message_q.list, list) {
1129 skb = alloc_skb(iucv_msg_length(&p->msg), GFP_ATOMIC | GFP_DMA); 1129 skb = alloc_skb(iucv_msg_length(&p->msg), GFP_ATOMIC | GFP_DMA);
1130 if (!skb) 1130 if (!skb)
1131 break; 1131 break;
1132 iucv_process_message(sk, skb, p->path, &p->msg); 1132 iucv_process_message(sk, skb, p->path, &p->msg);
1133 list_del(&p->list); 1133 list_del(&p->list);
1134 kfree(p); 1134 kfree(p);
1135 if (!skb_queue_empty(&iucv->backlog_skb_q)) 1135 if (!skb_queue_empty(&iucv->backlog_skb_q))
1136 break; 1136 break;
1137 } 1137 }
1138 } 1138 }
1139 1139
1140 static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock, 1140 static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
1141 struct msghdr *msg, size_t len, int flags) 1141 struct msghdr *msg, size_t len, int flags)
1142 { 1142 {
1143 int noblock = flags & MSG_DONTWAIT; 1143 int noblock = flags & MSG_DONTWAIT;
1144 struct sock *sk = sock->sk; 1144 struct sock *sk = sock->sk;
1145 struct iucv_sock *iucv = iucv_sk(sk); 1145 struct iucv_sock *iucv = iucv_sk(sk);
1146 unsigned int copied, rlen; 1146 unsigned int copied, rlen;
1147 struct sk_buff *skb, *rskb, *cskb; 1147 struct sk_buff *skb, *rskb, *cskb;
1148 int err = 0; 1148 int err = 0;
1149 1149
1150 if ((sk->sk_state == IUCV_DISCONN || sk->sk_state == IUCV_SEVERED) && 1150 if ((sk->sk_state == IUCV_DISCONN || sk->sk_state == IUCV_SEVERED) &&
1151 skb_queue_empty(&iucv->backlog_skb_q) && 1151 skb_queue_empty(&iucv->backlog_skb_q) &&
1152 skb_queue_empty(&sk->sk_receive_queue) && 1152 skb_queue_empty(&sk->sk_receive_queue) &&
1153 list_empty(&iucv->message_q.list)) 1153 list_empty(&iucv->message_q.list))
1154 return 0; 1154 return 0;
1155 1155
1156 if (flags & (MSG_OOB)) 1156 if (flags & (MSG_OOB))
1157 return -EOPNOTSUPP; 1157 return -EOPNOTSUPP;
1158 1158
1159 /* receive/dequeue next skb: 1159 /* receive/dequeue next skb:
1160 * the function understands MSG_PEEK and, thus, does not dequeue skb */ 1160 * the function understands MSG_PEEK and, thus, does not dequeue skb */
1161 skb = skb_recv_datagram(sk, flags, noblock, &err); 1161 skb = skb_recv_datagram(sk, flags, noblock, &err);
1162 if (!skb) { 1162 if (!skb) {
1163 if (sk->sk_shutdown & RCV_SHUTDOWN) 1163 if (sk->sk_shutdown & RCV_SHUTDOWN)
1164 return 0; 1164 return 0;
1165 return err; 1165 return err;
1166 } 1166 }
1167 1167
1168 rlen = skb->len; /* real length of skb */ 1168 rlen = skb->len; /* real length of skb */
1169 copied = min_t(unsigned int, rlen, len); 1169 copied = min_t(unsigned int, rlen, len);
1170 1170
1171 cskb = skb; 1171 cskb = skb;
1172 if (memcpy_toiovec(msg->msg_iov, cskb->data, copied)) { 1172 if (memcpy_toiovec(msg->msg_iov, cskb->data, copied)) {
1173 if (!(flags & MSG_PEEK)) 1173 if (!(flags & MSG_PEEK))
1174 skb_queue_head(&sk->sk_receive_queue, skb); 1174 skb_queue_head(&sk->sk_receive_queue, skb);
1175 return -EFAULT; 1175 return -EFAULT;
1176 } 1176 }
1177 1177
1178 /* SOCK_SEQPACKET: set MSG_TRUNC if recv buf size is too small */ 1178 /* SOCK_SEQPACKET: set MSG_TRUNC if recv buf size is too small */
1179 if (sk->sk_type == SOCK_SEQPACKET) { 1179 if (sk->sk_type == SOCK_SEQPACKET) {
1180 if (copied < rlen) 1180 if (copied < rlen)
1181 msg->msg_flags |= MSG_TRUNC; 1181 msg->msg_flags |= MSG_TRUNC;
1182 /* each iucv message contains a complete record */ 1182 /* each iucv message contains a complete record */
1183 msg->msg_flags |= MSG_EOR; 1183 msg->msg_flags |= MSG_EOR;
1184 } 1184 }
1185 1185
1186 /* create control message to store iucv msg target class: 1186 /* create control message to store iucv msg target class:
1187 * get the trgcls from the control buffer of the skb due to 1187 * get the trgcls from the control buffer of the skb due to
1188 * fragmentation of original iucv message. */ 1188 * fragmentation of original iucv message. */
1189 err = put_cmsg(msg, SOL_IUCV, SCM_IUCV_TRGCLS, 1189 err = put_cmsg(msg, SOL_IUCV, SCM_IUCV_TRGCLS,
1190 CB_TRGCLS_LEN, CB_TRGCLS(skb)); 1190 CB_TRGCLS_LEN, CB_TRGCLS(skb));
1191 if (err) { 1191 if (err) {
1192 if (!(flags & MSG_PEEK)) 1192 if (!(flags & MSG_PEEK))
1193 skb_queue_head(&sk->sk_receive_queue, skb); 1193 skb_queue_head(&sk->sk_receive_queue, skb);
1194 return err; 1194 return err;
1195 } 1195 }
1196 1196
1197 /* Mark read part of skb as used */ 1197 /* Mark read part of skb as used */
1198 if (!(flags & MSG_PEEK)) { 1198 if (!(flags & MSG_PEEK)) {
1199 1199
1200 /* SOCK_STREAM: re-queue skb if it contains unreceived data */ 1200 /* SOCK_STREAM: re-queue skb if it contains unreceived data */
1201 if (sk->sk_type == SOCK_STREAM) { 1201 if (sk->sk_type == SOCK_STREAM) {
1202 skb_pull(skb, copied); 1202 skb_pull(skb, copied);
1203 if (skb->len) { 1203 if (skb->len) {
1204 skb_queue_head(&sk->sk_receive_queue, skb); 1204 skb_queue_head(&sk->sk_receive_queue, skb);
1205 goto done; 1205 goto done;
1206 } 1206 }
1207 } 1207 }
1208 1208
1209 kfree_skb(skb); 1209 kfree_skb(skb);
1210 1210
1211 /* Queue backlog skbs */ 1211 /* Queue backlog skbs */
1212 rskb = skb_dequeue(&iucv->backlog_skb_q); 1212 rskb = skb_dequeue(&iucv->backlog_skb_q);
1213 while (rskb) { 1213 while (rskb) {
1214 if (sock_queue_rcv_skb(sk, rskb)) { 1214 if (sock_queue_rcv_skb(sk, rskb)) {
1215 skb_queue_head(&iucv->backlog_skb_q, 1215 skb_queue_head(&iucv->backlog_skb_q,
1216 rskb); 1216 rskb);
1217 break; 1217 break;
1218 } else { 1218 } else {
1219 rskb = skb_dequeue(&iucv->backlog_skb_q); 1219 rskb = skb_dequeue(&iucv->backlog_skb_q);
1220 } 1220 }
1221 } 1221 }
1222 if (skb_queue_empty(&iucv->backlog_skb_q)) { 1222 if (skb_queue_empty(&iucv->backlog_skb_q)) {
1223 spin_lock_bh(&iucv->message_q.lock); 1223 spin_lock_bh(&iucv->message_q.lock);
1224 if (!list_empty(&iucv->message_q.list)) 1224 if (!list_empty(&iucv->message_q.list))
1225 iucv_process_message_q(sk); 1225 iucv_process_message_q(sk);
1226 spin_unlock_bh(&iucv->message_q.lock); 1226 spin_unlock_bh(&iucv->message_q.lock);
1227 } 1227 }
1228 } 1228 }
1229 1229
1230 done: 1230 done:
1231 /* SOCK_SEQPACKET: return real length if MSG_TRUNC is set */ 1231 /* SOCK_SEQPACKET: return real length if MSG_TRUNC is set */
1232 if (sk->sk_type == SOCK_SEQPACKET && (flags & MSG_TRUNC)) 1232 if (sk->sk_type == SOCK_SEQPACKET && (flags & MSG_TRUNC))
1233 copied = rlen; 1233 copied = rlen;
1234 1234
1235 return copied; 1235 return copied;
1236 } 1236 }
1237 1237
1238 static inline unsigned int iucv_accept_poll(struct sock *parent) 1238 static inline unsigned int iucv_accept_poll(struct sock *parent)
1239 { 1239 {
1240 struct iucv_sock *isk, *n; 1240 struct iucv_sock *isk, *n;
1241 struct sock *sk; 1241 struct sock *sk;
1242 1242
1243 list_for_each_entry_safe(isk, n, &iucv_sk(parent)->accept_q, accept_q) { 1243 list_for_each_entry_safe(isk, n, &iucv_sk(parent)->accept_q, accept_q) {
1244 sk = (struct sock *) isk; 1244 sk = (struct sock *) isk;
1245 1245
1246 if (sk->sk_state == IUCV_CONNECTED) 1246 if (sk->sk_state == IUCV_CONNECTED)
1247 return POLLIN | POLLRDNORM; 1247 return POLLIN | POLLRDNORM;
1248 } 1248 }
1249 1249
1250 return 0; 1250 return 0;
1251 } 1251 }
1252 1252
1253 unsigned int iucv_sock_poll(struct file *file, struct socket *sock, 1253 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
1254 poll_table *wait) 1254 poll_table *wait)
1255 { 1255 {
1256 struct sock *sk = sock->sk; 1256 struct sock *sk = sock->sk;
1257 unsigned int mask = 0; 1257 unsigned int mask = 0;
1258 1258
1259 sock_poll_wait(file, sk->sk_sleep, wait); 1259 sock_poll_wait(file, sk->sk_sleep, wait);
1260 1260
1261 if (sk->sk_state == IUCV_LISTEN) 1261 if (sk->sk_state == IUCV_LISTEN)
1262 return iucv_accept_poll(sk); 1262 return iucv_accept_poll(sk);
1263 1263
1264 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) 1264 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
1265 mask |= POLLERR; 1265 mask |= POLLERR;
1266 1266
1267 if (sk->sk_shutdown & RCV_SHUTDOWN) 1267 if (sk->sk_shutdown & RCV_SHUTDOWN)
1268 mask |= POLLRDHUP; 1268 mask |= POLLRDHUP;
1269 1269
1270 if (sk->sk_shutdown == SHUTDOWN_MASK) 1270 if (sk->sk_shutdown == SHUTDOWN_MASK)
1271 mask |= POLLHUP; 1271 mask |= POLLHUP;
1272 1272
1273 if (!skb_queue_empty(&sk->sk_receive_queue) || 1273 if (!skb_queue_empty(&sk->sk_receive_queue) ||
1274 (sk->sk_shutdown & RCV_SHUTDOWN)) 1274 (sk->sk_shutdown & RCV_SHUTDOWN))
1275 mask |= POLLIN | POLLRDNORM; 1275 mask |= POLLIN | POLLRDNORM;
1276 1276
1277 if (sk->sk_state == IUCV_CLOSED) 1277 if (sk->sk_state == IUCV_CLOSED)
1278 mask |= POLLHUP; 1278 mask |= POLLHUP;
1279 1279
1280 if (sk->sk_state == IUCV_DISCONN || sk->sk_state == IUCV_SEVERED) 1280 if (sk->sk_state == IUCV_DISCONN || sk->sk_state == IUCV_SEVERED)
1281 mask |= POLLIN; 1281 mask |= POLLIN;
1282 1282
1283 if (sock_writeable(sk)) 1283 if (sock_writeable(sk))
1284 mask |= POLLOUT | POLLWRNORM | POLLWRBAND; 1284 mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
1285 else 1285 else
1286 set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags); 1286 set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags);
1287 1287
1288 return mask; 1288 return mask;
1289 } 1289 }
1290 1290
1291 static int iucv_sock_shutdown(struct socket *sock, int how) 1291 static int iucv_sock_shutdown(struct socket *sock, int how)
1292 { 1292 {
1293 struct sock *sk = sock->sk; 1293 struct sock *sk = sock->sk;
1294 struct iucv_sock *iucv = iucv_sk(sk); 1294 struct iucv_sock *iucv = iucv_sk(sk);
1295 struct iucv_message txmsg; 1295 struct iucv_message txmsg;
1296 int err = 0; 1296 int err = 0;
1297 1297
1298 how++; 1298 how++;
1299 1299
1300 if ((how & ~SHUTDOWN_MASK) || !how) 1300 if ((how & ~SHUTDOWN_MASK) || !how)
1301 return -EINVAL; 1301 return -EINVAL;
1302 1302
1303 lock_sock(sk); 1303 lock_sock(sk);
1304 switch (sk->sk_state) { 1304 switch (sk->sk_state) {
1305 case IUCV_DISCONN: 1305 case IUCV_DISCONN:
1306 case IUCV_CLOSING: 1306 case IUCV_CLOSING:
1307 case IUCV_SEVERED: 1307 case IUCV_SEVERED:
1308 case IUCV_CLOSED: 1308 case IUCV_CLOSED:
1309 err = -ENOTCONN; 1309 err = -ENOTCONN;
1310 goto fail; 1310 goto fail;
1311 1311
1312 default: 1312 default:
1313 sk->sk_shutdown |= how; 1313 sk->sk_shutdown |= how;
1314 break; 1314 break;
1315 } 1315 }
1316 1316
1317 if (how == SEND_SHUTDOWN || how == SHUTDOWN_MASK) { 1317 if (how == SEND_SHUTDOWN || how == SHUTDOWN_MASK) {
1318 txmsg.class = 0; 1318 txmsg.class = 0;
1319 txmsg.tag = 0; 1319 txmsg.tag = 0;
1320 err = iucv_message_send(iucv->path, &txmsg, IUCV_IPRMDATA, 0, 1320 err = iucv_message_send(iucv->path, &txmsg, IUCV_IPRMDATA, 0,
1321 (void *) iprm_shutdown, 8); 1321 (void *) iprm_shutdown, 8);
1322 if (err) { 1322 if (err) {
1323 switch (err) { 1323 switch (err) {
1324 case 1: 1324 case 1:
1325 err = -ENOTCONN; 1325 err = -ENOTCONN;
1326 break; 1326 break;
1327 case 2: 1327 case 2:
1328 err = -ECONNRESET; 1328 err = -ECONNRESET;
1329 break; 1329 break;
1330 default: 1330 default:
1331 err = -ENOTCONN; 1331 err = -ENOTCONN;
1332 break; 1332 break;
1333 } 1333 }
1334 } 1334 }
1335 } 1335 }
1336 1336
1337 if (how == RCV_SHUTDOWN || how == SHUTDOWN_MASK) { 1337 if (how == RCV_SHUTDOWN || how == SHUTDOWN_MASK) {
1338 err = iucv_path_quiesce(iucv_sk(sk)->path, NULL); 1338 err = iucv_path_quiesce(iucv_sk(sk)->path, NULL);
1339 if (err) 1339 if (err)
1340 err = -ENOTCONN; 1340 err = -ENOTCONN;
1341 1341
1342 skb_queue_purge(&sk->sk_receive_queue); 1342 skb_queue_purge(&sk->sk_receive_queue);
1343 } 1343 }
1344 1344
1345 /* Wake up anyone sleeping in poll */ 1345 /* Wake up anyone sleeping in poll */
1346 sk->sk_state_change(sk); 1346 sk->sk_state_change(sk);
1347 1347
1348 fail: 1348 fail:
1349 release_sock(sk); 1349 release_sock(sk);
1350 return err; 1350 return err;
1351 } 1351 }
1352 1352
1353 static int iucv_sock_release(struct socket *sock) 1353 static int iucv_sock_release(struct socket *sock)
1354 { 1354 {
1355 struct sock *sk = sock->sk; 1355 struct sock *sk = sock->sk;
1356 int err = 0; 1356 int err = 0;
1357 1357
1358 if (!sk) 1358 if (!sk)
1359 return 0; 1359 return 0;
1360 1360
1361 iucv_sock_close(sk); 1361 iucv_sock_close(sk);
1362 1362
1363 /* Unregister with IUCV base support */ 1363 /* Unregister with IUCV base support */
1364 if (iucv_sk(sk)->path) { 1364 if (iucv_sk(sk)->path) {
1365 iucv_path_sever(iucv_sk(sk)->path, NULL); 1365 iucv_path_sever(iucv_sk(sk)->path, NULL);
1366 iucv_path_free(iucv_sk(sk)->path); 1366 iucv_path_free(iucv_sk(sk)->path);
1367 iucv_sk(sk)->path = NULL; 1367 iucv_sk(sk)->path = NULL;
1368 } 1368 }
1369 1369
1370 sock_orphan(sk); 1370 sock_orphan(sk);
1371 iucv_sock_kill(sk); 1371 iucv_sock_kill(sk);
1372 return err; 1372 return err;
1373 } 1373 }
1374 1374
1375 /* getsockopt and setsockopt */ 1375 /* getsockopt and setsockopt */
1376 static int iucv_sock_setsockopt(struct socket *sock, int level, int optname, 1376 static int iucv_sock_setsockopt(struct socket *sock, int level, int optname,
1377 char __user *optval, int optlen) 1377 char __user *optval, int optlen)
1378 { 1378 {
1379 struct sock *sk = sock->sk; 1379 struct sock *sk = sock->sk;
1380 struct iucv_sock *iucv = iucv_sk(sk); 1380 struct iucv_sock *iucv = iucv_sk(sk);
1381 int val; 1381 int val;
1382 int rc; 1382 int rc;
1383 1383
1384 if (level != SOL_IUCV) 1384 if (level != SOL_IUCV)
1385 return -ENOPROTOOPT; 1385 return -ENOPROTOOPT;
1386 1386
1387 if (optlen < sizeof(int)) 1387 if (optlen < sizeof(int))
1388 return -EINVAL; 1388 return -EINVAL;
1389 1389
1390 if (get_user(val, (int __user *) optval)) 1390 if (get_user(val, (int __user *) optval))
1391 return -EFAULT; 1391 return -EFAULT;
1392 1392
1393 rc = 0; 1393 rc = 0;
1394 1394
1395 lock_sock(sk); 1395 lock_sock(sk);
1396 switch (optname) { 1396 switch (optname) {
1397 case SO_IPRMDATA_MSG: 1397 case SO_IPRMDATA_MSG:
1398 if (val) 1398 if (val)
1399 iucv->flags |= IUCV_IPRMDATA; 1399 iucv->flags |= IUCV_IPRMDATA;
1400 else 1400 else
1401 iucv->flags &= ~IUCV_IPRMDATA; 1401 iucv->flags &= ~IUCV_IPRMDATA;
1402 break; 1402 break;
1403 case SO_MSGLIMIT: 1403 case SO_MSGLIMIT:
1404 switch (sk->sk_state) { 1404 switch (sk->sk_state) {
1405 case IUCV_OPEN: 1405 case IUCV_OPEN:
1406 case IUCV_BOUND: 1406 case IUCV_BOUND:
1407 if (val < 1 || val > (u16)(~0)) 1407 if (val < 1 || val > (u16)(~0))
1408 rc = -EINVAL; 1408 rc = -EINVAL;
1409 else 1409 else
1410 iucv->msglimit = val; 1410 iucv->msglimit = val;
1411 break; 1411 break;
1412 default: 1412 default:
1413 rc = -EINVAL; 1413 rc = -EINVAL;
1414 break; 1414 break;
1415 } 1415 }
1416 break; 1416 break;
1417 default: 1417 default:
1418 rc = -ENOPROTOOPT; 1418 rc = -ENOPROTOOPT;
1419 break; 1419 break;
1420 } 1420 }
1421 release_sock(sk); 1421 release_sock(sk);
1422 1422
1423 return rc; 1423 return rc;
1424 } 1424 }
1425 1425
1426 static int iucv_sock_getsockopt(struct socket *sock, int level, int optname, 1426 static int iucv_sock_getsockopt(struct socket *sock, int level, int optname,
1427 char __user *optval, int __user *optlen) 1427 char __user *optval, int __user *optlen)
1428 { 1428 {
1429 struct sock *sk = sock->sk; 1429 struct sock *sk = sock->sk;
1430 struct iucv_sock *iucv = iucv_sk(sk); 1430 struct iucv_sock *iucv = iucv_sk(sk);
1431 int val, len; 1431 int val, len;
1432 1432
1433 if (level != SOL_IUCV) 1433 if (level != SOL_IUCV)
1434 return -ENOPROTOOPT; 1434 return -ENOPROTOOPT;
1435 1435
1436 if (get_user(len, optlen)) 1436 if (get_user(len, optlen))
1437 return -EFAULT; 1437 return -EFAULT;
1438 1438
1439 if (len < 0) 1439 if (len < 0)
1440 return -EINVAL; 1440 return -EINVAL;
1441 1441
1442 len = min_t(unsigned int, len, sizeof(int)); 1442 len = min_t(unsigned int, len, sizeof(int));
1443 1443
1444 switch (optname) { 1444 switch (optname) {
1445 case SO_IPRMDATA_MSG: 1445 case SO_IPRMDATA_MSG:
1446 val = (iucv->flags & IUCV_IPRMDATA) ? 1 : 0; 1446 val = (iucv->flags & IUCV_IPRMDATA) ? 1 : 0;
1447 break; 1447 break;
1448 case SO_MSGLIMIT: 1448 case SO_MSGLIMIT:
1449 lock_sock(sk); 1449 lock_sock(sk);
1450 val = (iucv->path != NULL) ? iucv->path->msglim /* connected */ 1450 val = (iucv->path != NULL) ? iucv->path->msglim /* connected */
1451 : iucv->msglimit; /* default */ 1451 : iucv->msglimit; /* default */
1452 release_sock(sk); 1452 release_sock(sk);
1453 break; 1453 break;
1454 default: 1454 default:
1455 return -ENOPROTOOPT; 1455 return -ENOPROTOOPT;
1456 } 1456 }
1457 1457
1458 if (put_user(len, optlen)) 1458 if (put_user(len, optlen))
1459 return -EFAULT; 1459 return -EFAULT;
1460 if (copy_to_user(optval, &val, len)) 1460 if (copy_to_user(optval, &val, len))
1461 return -EFAULT; 1461 return -EFAULT;
1462 1462
1463 return 0; 1463 return 0;
1464 } 1464 }
1465 1465
1466 1466
1467 /* Callback wrappers - called from iucv base support */ 1467 /* Callback wrappers - called from iucv base support */
1468 static int iucv_callback_connreq(struct iucv_path *path, 1468 static int iucv_callback_connreq(struct iucv_path *path,
1469 u8 ipvmid[8], u8 ipuser[16]) 1469 u8 ipvmid[8], u8 ipuser[16])
1470 { 1470 {
1471 unsigned char user_data[16]; 1471 unsigned char user_data[16];
1472 unsigned char nuser_data[16]; 1472 unsigned char nuser_data[16];
1473 unsigned char src_name[8]; 1473 unsigned char src_name[8];
1474 struct hlist_node *node; 1474 struct hlist_node *node;
1475 struct sock *sk, *nsk; 1475 struct sock *sk, *nsk;
1476 struct iucv_sock *iucv, *niucv; 1476 struct iucv_sock *iucv, *niucv;
1477 int err; 1477 int err;
1478 1478
1479 memcpy(src_name, ipuser, 8); 1479 memcpy(src_name, ipuser, 8);
1480 EBCASC(src_name, 8); 1480 EBCASC(src_name, 8);
1481 /* Find out if this path belongs to af_iucv. */ 1481 /* Find out if this path belongs to af_iucv. */
1482 read_lock(&iucv_sk_list.lock); 1482 read_lock(&iucv_sk_list.lock);
1483 iucv = NULL; 1483 iucv = NULL;
1484 sk = NULL; 1484 sk = NULL;
1485 sk_for_each(sk, node, &iucv_sk_list.head) 1485 sk_for_each(sk, node, &iucv_sk_list.head)
1486 if (sk->sk_state == IUCV_LISTEN && 1486 if (sk->sk_state == IUCV_LISTEN &&
1487 !memcmp(&iucv_sk(sk)->src_name, src_name, 8)) { 1487 !memcmp(&iucv_sk(sk)->src_name, src_name, 8)) {
1488 /* 1488 /*
1489 * Found a listening socket with 1489 * Found a listening socket with
1490 * src_name == ipuser[0-7]. 1490 * src_name == ipuser[0-7].
1491 */ 1491 */
1492 iucv = iucv_sk(sk); 1492 iucv = iucv_sk(sk);
1493 break; 1493 break;
1494 } 1494 }
1495 read_unlock(&iucv_sk_list.lock); 1495 read_unlock(&iucv_sk_list.lock);
1496 if (!iucv) 1496 if (!iucv)
1497 /* No socket found, not one of our paths. */ 1497 /* No socket found, not one of our paths. */
1498 return -EINVAL; 1498 return -EINVAL;
1499 1499
1500 bh_lock_sock(sk); 1500 bh_lock_sock(sk);
1501 1501
1502 /* Check if parent socket is listening */ 1502 /* Check if parent socket is listening */
1503 low_nmcpy(user_data, iucv->src_name); 1503 low_nmcpy(user_data, iucv->src_name);
1504 high_nmcpy(user_data, iucv->dst_name); 1504 high_nmcpy(user_data, iucv->dst_name);
1505 ASCEBC(user_data, sizeof(user_data)); 1505 ASCEBC(user_data, sizeof(user_data));
1506 if (sk->sk_state != IUCV_LISTEN) { 1506 if (sk->sk_state != IUCV_LISTEN) {
1507 err = iucv_path_sever(path, user_data); 1507 err = iucv_path_sever(path, user_data);
1508 iucv_path_free(path); 1508 iucv_path_free(path);
1509 goto fail; 1509 goto fail;
1510 } 1510 }
1511 1511
1512 /* Check for backlog size */ 1512 /* Check for backlog size */
1513 if (sk_acceptq_is_full(sk)) { 1513 if (sk_acceptq_is_full(sk)) {
1514 err = iucv_path_sever(path, user_data); 1514 err = iucv_path_sever(path, user_data);
1515 iucv_path_free(path); 1515 iucv_path_free(path);
1516 goto fail; 1516 goto fail;
1517 } 1517 }
1518 1518
1519 /* Create the new socket */ 1519 /* Create the new socket */
1520 nsk = iucv_sock_alloc(NULL, sk->sk_type, GFP_ATOMIC); 1520 nsk = iucv_sock_alloc(NULL, sk->sk_type, GFP_ATOMIC);
1521 if (!nsk) { 1521 if (!nsk) {
1522 err = iucv_path_sever(path, user_data); 1522 err = iucv_path_sever(path, user_data);
1523 iucv_path_free(path); 1523 iucv_path_free(path);
1524 goto fail; 1524 goto fail;
1525 } 1525 }
1526 1526
1527 niucv = iucv_sk(nsk); 1527 niucv = iucv_sk(nsk);
1528 iucv_sock_init(nsk, sk); 1528 iucv_sock_init(nsk, sk);
1529 1529
1530 /* Set the new iucv_sock */ 1530 /* Set the new iucv_sock */
1531 memcpy(niucv->dst_name, ipuser + 8, 8); 1531 memcpy(niucv->dst_name, ipuser + 8, 8);
1532 EBCASC(niucv->dst_name, 8); 1532 EBCASC(niucv->dst_name, 8);
1533 memcpy(niucv->dst_user_id, ipvmid, 8); 1533 memcpy(niucv->dst_user_id, ipvmid, 8);
1534 memcpy(niucv->src_name, iucv->src_name, 8); 1534 memcpy(niucv->src_name, iucv->src_name, 8);
1535 memcpy(niucv->src_user_id, iucv->src_user_id, 8); 1535 memcpy(niucv->src_user_id, iucv->src_user_id, 8);
1536 niucv->path = path; 1536 niucv->path = path;
1537 1537
1538 /* Call iucv_accept */ 1538 /* Call iucv_accept */
1539 high_nmcpy(nuser_data, ipuser + 8); 1539 high_nmcpy(nuser_data, ipuser + 8);
1540 memcpy(nuser_data + 8, niucv->src_name, 8); 1540 memcpy(nuser_data + 8, niucv->src_name, 8);
1541 ASCEBC(nuser_data + 8, 8); 1541 ASCEBC(nuser_data + 8, 8);
1542 1542
1543 /* set message limit for path based on msglimit of accepting socket */ 1543 /* set message limit for path based on msglimit of accepting socket */
1544 niucv->msglimit = iucv->msglimit; 1544 niucv->msglimit = iucv->msglimit;
1545 path->msglim = iucv->msglimit; 1545 path->msglim = iucv->msglimit;
1546 err = iucv_path_accept(path, &af_iucv_handler, nuser_data, nsk); 1546 err = iucv_path_accept(path, &af_iucv_handler, nuser_data, nsk);
1547 if (err) { 1547 if (err) {
1548 err = iucv_path_sever(path, user_data); 1548 err = iucv_path_sever(path, user_data);
1549 iucv_path_free(path); 1549 iucv_path_free(path);
1550 iucv_sock_kill(nsk); 1550 iucv_sock_kill(nsk);
1551 goto fail; 1551 goto fail;
1552 } 1552 }
1553 1553
1554 iucv_accept_enqueue(sk, nsk); 1554 iucv_accept_enqueue(sk, nsk);
1555 1555
1556 /* Wake up accept */ 1556 /* Wake up accept */
1557 nsk->sk_state = IUCV_CONNECTED; 1557 nsk->sk_state = IUCV_CONNECTED;
1558 sk->sk_data_ready(sk, 1); 1558 sk->sk_data_ready(sk, 1);
1559 err = 0; 1559 err = 0;
1560 fail: 1560 fail:
1561 bh_unlock_sock(sk); 1561 bh_unlock_sock(sk);
1562 return 0; 1562 return 0;
1563 } 1563 }
1564 1564
1565 static void iucv_callback_connack(struct iucv_path *path, u8 ipuser[16]) 1565 static void iucv_callback_connack(struct iucv_path *path, u8 ipuser[16])
1566 { 1566 {
1567 struct sock *sk = path->private; 1567 struct sock *sk = path->private;
1568 1568
1569 sk->sk_state = IUCV_CONNECTED; 1569 sk->sk_state = IUCV_CONNECTED;
1570 sk->sk_state_change(sk); 1570 sk->sk_state_change(sk);
1571 } 1571 }
1572 1572
1573 static void iucv_callback_rx(struct iucv_path *path, struct iucv_message *msg) 1573 static void iucv_callback_rx(struct iucv_path *path, struct iucv_message *msg)
1574 { 1574 {
1575 struct sock *sk = path->private; 1575 struct sock *sk = path->private;
1576 struct iucv_sock *iucv = iucv_sk(sk); 1576 struct iucv_sock *iucv = iucv_sk(sk);
1577 struct sk_buff *skb; 1577 struct sk_buff *skb;
1578 struct sock_msg_q *save_msg; 1578 struct sock_msg_q *save_msg;
1579 int len; 1579 int len;
1580 1580
1581 if (sk->sk_shutdown & RCV_SHUTDOWN) { 1581 if (sk->sk_shutdown & RCV_SHUTDOWN) {
1582 iucv_message_reject(path, msg); 1582 iucv_message_reject(path, msg);
1583 return; 1583 return;
1584 } 1584 }
1585 1585
1586 spin_lock(&iucv->message_q.lock); 1586 spin_lock(&iucv->message_q.lock);
1587 1587
1588 if (!list_empty(&iucv->message_q.list) || 1588 if (!list_empty(&iucv->message_q.list) ||
1589 !skb_queue_empty(&iucv->backlog_skb_q)) 1589 !skb_queue_empty(&iucv->backlog_skb_q))
1590 goto save_message; 1590 goto save_message;
1591 1591
1592 len = atomic_read(&sk->sk_rmem_alloc); 1592 len = atomic_read(&sk->sk_rmem_alloc);
1593 len += iucv_msg_length(msg) + sizeof(struct sk_buff); 1593 len += iucv_msg_length(msg) + sizeof(struct sk_buff);
1594 if (len > sk->sk_rcvbuf) 1594 if (len > sk->sk_rcvbuf)
1595 goto save_message; 1595 goto save_message;
1596 1596
1597 skb = alloc_skb(iucv_msg_length(msg), GFP_ATOMIC | GFP_DMA); 1597 skb = alloc_skb(iucv_msg_length(msg), GFP_ATOMIC | GFP_DMA);
1598 if (!skb) 1598 if (!skb)
1599 goto save_message; 1599 goto save_message;
1600 1600
1601 iucv_process_message(sk, skb, path, msg); 1601 iucv_process_message(sk, skb, path, msg);
1602 goto out_unlock; 1602 goto out_unlock;
1603 1603
1604 save_message: 1604 save_message:
1605 save_msg = kzalloc(sizeof(struct sock_msg_q), GFP_ATOMIC | GFP_DMA); 1605 save_msg = kzalloc(sizeof(struct sock_msg_q), GFP_ATOMIC | GFP_DMA);
1606 if (!save_msg) 1606 if (!save_msg)
1607 return; 1607 return;
1608 save_msg->path = path; 1608 save_msg->path = path;
1609 save_msg->msg = *msg; 1609 save_msg->msg = *msg;
1610 1610
1611 list_add_tail(&save_msg->list, &iucv->message_q.list); 1611 list_add_tail(&save_msg->list, &iucv->message_q.list);
1612 1612
1613 out_unlock: 1613 out_unlock:
1614 spin_unlock(&iucv->message_q.lock); 1614 spin_unlock(&iucv->message_q.lock);
1615 } 1615 }
1616 1616
1617 static void iucv_callback_txdone(struct iucv_path *path, 1617 static void iucv_callback_txdone(struct iucv_path *path,
1618 struct iucv_message *msg) 1618 struct iucv_message *msg)
1619 { 1619 {
1620 struct sock *sk = path->private; 1620 struct sock *sk = path->private;
1621 struct sk_buff *this = NULL; 1621 struct sk_buff *this = NULL;
1622 struct sk_buff_head *list = &iucv_sk(sk)->send_skb_q; 1622 struct sk_buff_head *list = &iucv_sk(sk)->send_skb_q;
1623 struct sk_buff *list_skb = list->next; 1623 struct sk_buff *list_skb = list->next;
1624 unsigned long flags; 1624 unsigned long flags;
1625 1625
1626 if (!skb_queue_empty(list)) { 1626 if (!skb_queue_empty(list)) {
1627 spin_lock_irqsave(&list->lock, flags); 1627 spin_lock_irqsave(&list->lock, flags);
1628 1628
1629 while (list_skb != (struct sk_buff *)list) { 1629 while (list_skb != (struct sk_buff *)list) {
1630 if (!memcmp(&msg->tag, CB_TAG(list_skb), CB_TAG_LEN)) { 1630 if (!memcmp(&msg->tag, CB_TAG(list_skb), CB_TAG_LEN)) {
1631 this = list_skb; 1631 this = list_skb;
1632 break; 1632 break;
1633 } 1633 }
1634 list_skb = list_skb->next; 1634 list_skb = list_skb->next;
1635 } 1635 }
1636 if (this) 1636 if (this)
1637 __skb_unlink(this, list); 1637 __skb_unlink(this, list);
1638 1638
1639 spin_unlock_irqrestore(&list->lock, flags); 1639 spin_unlock_irqrestore(&list->lock, flags);
1640 1640
1641 if (this) { 1641 if (this) {
1642 kfree_skb(this); 1642 kfree_skb(this);
1643 /* wake up any process waiting for sending */ 1643 /* wake up any process waiting for sending */
1644 iucv_sock_wake_msglim(sk); 1644 iucv_sock_wake_msglim(sk);
1645 } 1645 }
1646 } 1646 }
1647 BUG_ON(!this); 1647 BUG_ON(!this);
1648 1648
1649 if (sk->sk_state == IUCV_CLOSING) { 1649 if (sk->sk_state == IUCV_CLOSING) {
1650 if (skb_queue_empty(&iucv_sk(sk)->send_skb_q)) { 1650 if (skb_queue_empty(&iucv_sk(sk)->send_skb_q)) {
1651 sk->sk_state = IUCV_CLOSED; 1651 sk->sk_state = IUCV_CLOSED;
1652 sk->sk_state_change(sk); 1652 sk->sk_state_change(sk);
1653 } 1653 }
1654 } 1654 }
1655 1655
1656 } 1656 }
1657 1657
1658 static void iucv_callback_connrej(struct iucv_path *path, u8 ipuser[16]) 1658 static void iucv_callback_connrej(struct iucv_path *path, u8 ipuser[16])
1659 { 1659 {
1660 struct sock *sk = path->private; 1660 struct sock *sk = path->private;
1661 1661
1662 if (!list_empty(&iucv_sk(sk)->accept_q)) 1662 if (!list_empty(&iucv_sk(sk)->accept_q))
1663 sk->sk_state = IUCV_SEVERED; 1663 sk->sk_state = IUCV_SEVERED;
1664 else 1664 else
1665 sk->sk_state = IUCV_DISCONN; 1665 sk->sk_state = IUCV_DISCONN;
1666 1666
1667 sk->sk_state_change(sk); 1667 sk->sk_state_change(sk);
1668 } 1668 }
1669 1669
1670 /* called if the other communication side shuts down its RECV direction; 1670 /* called if the other communication side shuts down its RECV direction;
1671 * in turn, the callback sets SEND_SHUTDOWN to disable sending of data. 1671 * in turn, the callback sets SEND_SHUTDOWN to disable sending of data.
1672 */ 1672 */
1673 static void iucv_callback_shutdown(struct iucv_path *path, u8 ipuser[16]) 1673 static void iucv_callback_shutdown(struct iucv_path *path, u8 ipuser[16])
1674 { 1674 {
1675 struct sock *sk = path->private; 1675 struct sock *sk = path->private;
1676 1676
1677 bh_lock_sock(sk); 1677 bh_lock_sock(sk);
1678 if (sk->sk_state != IUCV_CLOSED) { 1678 if (sk->sk_state != IUCV_CLOSED) {
1679 sk->sk_shutdown |= SEND_SHUTDOWN; 1679 sk->sk_shutdown |= SEND_SHUTDOWN;
1680 sk->sk_state_change(sk); 1680 sk->sk_state_change(sk);
1681 } 1681 }
1682 bh_unlock_sock(sk); 1682 bh_unlock_sock(sk);
1683 } 1683 }
1684 1684
1685 static const struct proto_ops iucv_sock_ops = { 1685 static const struct proto_ops iucv_sock_ops = {
1686 .family = PF_IUCV, 1686 .family = PF_IUCV,
1687 .owner = THIS_MODULE, 1687 .owner = THIS_MODULE,
1688 .release = iucv_sock_release, 1688 .release = iucv_sock_release,
1689 .bind = iucv_sock_bind, 1689 .bind = iucv_sock_bind,
1690 .connect = iucv_sock_connect, 1690 .connect = iucv_sock_connect,
1691 .listen = iucv_sock_listen, 1691 .listen = iucv_sock_listen,
1692 .accept = iucv_sock_accept, 1692 .accept = iucv_sock_accept,
1693 .getname = iucv_sock_getname, 1693 .getname = iucv_sock_getname,
1694 .sendmsg = iucv_sock_sendmsg, 1694 .sendmsg = iucv_sock_sendmsg,
1695 .recvmsg = iucv_sock_recvmsg, 1695 .recvmsg = iucv_sock_recvmsg,
1696 .poll = iucv_sock_poll, 1696 .poll = iucv_sock_poll,
1697 .ioctl = sock_no_ioctl, 1697 .ioctl = sock_no_ioctl,
1698 .mmap = sock_no_mmap, 1698 .mmap = sock_no_mmap,
1699 .socketpair = sock_no_socketpair, 1699 .socketpair = sock_no_socketpair,
1700 .shutdown = iucv_sock_shutdown, 1700 .shutdown = iucv_sock_shutdown,
1701 .setsockopt = iucv_sock_setsockopt, 1701 .setsockopt = iucv_sock_setsockopt,
1702 .getsockopt = iucv_sock_getsockopt, 1702 .getsockopt = iucv_sock_getsockopt,
1703 }; 1703 };
1704 1704
1705 static struct net_proto_family iucv_sock_family_ops = { 1705 static struct net_proto_family iucv_sock_family_ops = {
1706 .family = AF_IUCV, 1706 .family = AF_IUCV,
1707 .owner = THIS_MODULE, 1707 .owner = THIS_MODULE,
1708 .create = iucv_sock_create, 1708 .create = iucv_sock_create,
1709 }; 1709 };
1710 1710
1711 static int __init afiucv_init(void) 1711 static int __init afiucv_init(void)
1712 { 1712 {
1713 int err; 1713 int err;
1714 1714
1715 if (!MACHINE_IS_VM) { 1715 if (!MACHINE_IS_VM) {
1716 pr_err("The af_iucv module cannot be loaded" 1716 pr_err("The af_iucv module cannot be loaded"
1717 " without z/VM\n"); 1717 " without z/VM\n");
1718 err = -EPROTONOSUPPORT; 1718 err = -EPROTONOSUPPORT;
1719 goto out; 1719 goto out;
1720 } 1720 }
1721 cpcmd("QUERY USERID", iucv_userid, sizeof(iucv_userid), &err); 1721 cpcmd("QUERY USERID", iucv_userid, sizeof(iucv_userid), &err);
1722 if (unlikely(err)) { 1722 if (unlikely(err)) {
1723 WARN_ON(err); 1723 WARN_ON(err);
1724 err = -EPROTONOSUPPORT; 1724 err = -EPROTONOSUPPORT;
1725 goto out; 1725 goto out;
1726 } 1726 }
1727 1727
1728 err = iucv_register(&af_iucv_handler, 0); 1728 err = iucv_register(&af_iucv_handler, 0);
1729 if (err) 1729 if (err)
1730 goto out; 1730 goto out;
1731 err = proto_register(&iucv_proto, 0); 1731 err = proto_register(&iucv_proto, 0);
1732 if (err) 1732 if (err)
1733 goto out_iucv; 1733 goto out_iucv;
1734 err = sock_register(&iucv_sock_family_ops); 1734 err = sock_register(&iucv_sock_family_ops);
1735 if (err) 1735 if (err)
1736 goto out_proto; 1736 goto out_proto;
1737 /* establish dummy device */ 1737 /* establish dummy device */
1738 err = driver_register(&af_iucv_driver); 1738 err = driver_register(&af_iucv_driver);
1739 if (err) 1739 if (err)
1740 goto out_sock; 1740 goto out_sock;
1741 af_iucv_dev = kzalloc(sizeof(struct device), GFP_KERNEL); 1741 af_iucv_dev = kzalloc(sizeof(struct device), GFP_KERNEL);
1742 if (!af_iucv_dev) { 1742 if (!af_iucv_dev) {
1743 err = -ENOMEM; 1743 err = -ENOMEM;
1744 goto out_driver; 1744 goto out_driver;
1745 } 1745 }
1746 dev_set_name(af_iucv_dev, "af_iucv"); 1746 dev_set_name(af_iucv_dev, "af_iucv");
1747 af_iucv_dev->bus = &iucv_bus; 1747 af_iucv_dev->bus = &iucv_bus;
1748 af_iucv_dev->parent = iucv_root; 1748 af_iucv_dev->parent = iucv_root;
1749 af_iucv_dev->release = (void (*)(struct device *))kfree; 1749 af_iucv_dev->release = (void (*)(struct device *))kfree;
1750 af_iucv_dev->driver = &af_iucv_driver; 1750 af_iucv_dev->driver = &af_iucv_driver;
1751 err = device_register(af_iucv_dev); 1751 err = device_register(af_iucv_dev);
1752 if (err) 1752 if (err)
1753 goto out_driver; 1753 goto out_driver;
1754 1754
1755 return 0; 1755 return 0;
1756 1756
1757 out_driver: 1757 out_driver:
1758 driver_unregister(&af_iucv_driver); 1758 driver_unregister(&af_iucv_driver);
1759 out_sock: 1759 out_sock:
1760 sock_unregister(PF_IUCV); 1760 sock_unregister(PF_IUCV);
1761 out_proto: 1761 out_proto:
1762 proto_unregister(&iucv_proto); 1762 proto_unregister(&iucv_proto);
1763 out_iucv: 1763 out_iucv:
1764 iucv_unregister(&af_iucv_handler, 0); 1764 iucv_unregister(&af_iucv_handler, 0);
1765 out: 1765 out:
1766 return err; 1766 return err;
1767 } 1767 }
1768 1768
1769 static void __exit afiucv_exit(void) 1769 static void __exit afiucv_exit(void)
1770 { 1770 {
1771 device_unregister(af_iucv_dev); 1771 device_unregister(af_iucv_dev);
1772 driver_unregister(&af_iucv_driver); 1772 driver_unregister(&af_iucv_driver);
1773 sock_unregister(PF_IUCV); 1773 sock_unregister(PF_IUCV);
1774 proto_unregister(&iucv_proto); 1774 proto_unregister(&iucv_proto);
1775 iucv_unregister(&af_iucv_handler, 0); 1775 iucv_unregister(&af_iucv_handler, 0);
1776 } 1776 }
1777 1777
1778 module_init(afiucv_init); 1778 module_init(afiucv_init);
1779 module_exit(afiucv_exit); 1779 module_exit(afiucv_exit);
1780 1780
1781 MODULE_AUTHOR("Jennifer Hunt <jenhunt@us.ibm.com>"); 1781 MODULE_AUTHOR("Jennifer Hunt <jenhunt@us.ibm.com>");
1782 MODULE_DESCRIPTION("IUCV Sockets ver " VERSION); 1782 MODULE_DESCRIPTION("IUCV Sockets ver " VERSION);
1783 MODULE_VERSION(VERSION); 1783 MODULE_VERSION(VERSION);
1784 MODULE_LICENSE("GPL"); 1784 MODULE_LICENSE("GPL");
1785 MODULE_ALIAS_NETPROTO(PF_IUCV); 1785 MODULE_ALIAS_NETPROTO(PF_IUCV);