9p: fix sparse warnings

Several sparse warnings were introduced by patches accepted during the merge window which weren't caught. This patch fixes those warnings. Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

9p: fix sparse warnings
Several sparse warnings were introduced by patches accepted during the merge window which weren't caught. This patch fixes those warnings. Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Eric Van Hensbergen · Eric Van Hensbergen
1 parent fc79d4b104
Showing 3 changed files with 14 additions and 12 deletions Side-by-side Diff
include/net/9p/client.h
net/9p/client.c
net/9p/protocol.c
@@ -182,6 +182,7 @@
 	struct list_head dlist;	/* list of all fids attached to a dentry */
 };
  
+int p9_client_version(struct p9_client *);
 struct p9_client *p9_client_create(const char *dev_name, char *options);
 void p9_client_destroy(struct p9_client *clnt);
 void p9_client_disconnect(struct p9_client *clnt);
@@ -159,6 +159,7 @@
  
 			if (!c->reqs[row]) {
 				printk(KERN_ERR "Couldn't grow tag array\n");
+				spin_unlock_irqrestore(&c->lock, flags);
 				return ERR_PTR(-ENOMEM);
 			}
 			for (col = 0; col < P9_ROW_MAXTAG; col++) {
@@ -186,7 +186,7 @@
 			}
 			break;
 		case 's':{
-				char **ptr = va_arg(ap, char **);
+				char **sptr = va_arg(ap, char **);
 				int16_t len;
 				int size;
  
  
  
  
@@ -196,17 +196,17 @@
  
 				size = MAX(len, 0);
  
-				*ptr = kmalloc(size + 1, GFP_KERNEL);
-				if (*ptr == NULL) {
+				*sptr = kmalloc(size + 1, GFP_KERNEL);
+				if (*sptr == NULL) {
 					errcode = -EFAULT;
 					break;
 				}
-				if (pdu_read(pdu, *ptr, size)) {
+				if (pdu_read(pdu, *sptr, size)) {
 					errcode = -EFAULT;
-					kfree(*ptr);
-					*ptr = NULL;
+					kfree(*sptr);
+					*sptr = NULL;
 				} else
-					(*ptr)[size] = 0;
+					(*sptr)[size] = 0;
 			}
 			break;
 		case 'Q':{
  
  
@@ -380,13 +380,13 @@
 			}
 			break;
 		case 's':{
-				const char *ptr = va_arg(ap, const char *);
+				const char *sptr = va_arg(ap, const char *);
 				int16_t len = 0;
-				if (ptr)
-					len = MIN(strlen(ptr), USHORT_MAX);
+				if (sptr)
+					len = MIN(strlen(sptr), USHORT_MAX);
  
 				errcode = p9pdu_writef(pdu, optional, "w", len);
-				if (!errcode && pdu_write(pdu, ptr, len))
+				if (!errcode && pdu_write(pdu, sptr, len))
 					errcode = -EFAULT;
 			}
 			break;
@@ -426,7 +426,7 @@
 		case 'U':{
 				int32_t count = va_arg(ap, int32_t);
 				const char __user *udata =
-						va_arg(ap, const void *);
+						va_arg(ap, const void __user *);
 				errcode =
 				    p9pdu_writef(pdu, optional, "d", count);
 				if (!errcode && pdu_write_u(pdu, udata, count))
...	...	@@ -182,6 +182,7 @@
182	182	struct list_head dlist; /* list of all fids attached to a dentry */
183	183	};
184	184
	185	+int p9_client_version(struct p9_client *);
185	186	struct p9_client p9_client_create(const char dev_name, char *options);
186	187	void p9_client_destroy(struct p9_client *clnt);
187	188	void p9_client_disconnect(struct p9_client *clnt);
...	...	@@ -159,6 +159,7 @@
159	159
160	160	if (!c->reqs[row]) {
161	161	printk(KERN_ERR "Couldn't grow tag array\n");
	162	+ spin_unlock_irqrestore(&c->lock, flags);
162	163	return ERR_PTR(-ENOMEM);
163	164	}
164	165	for (col = 0; col < P9_ROW_MAXTAG; col++) {
...	...	@@ -186,7 +186,7 @@
186	186	}
187	187	break;
188	188	case 's':{
189		- char ptr = va_arg(ap, char );
	189	+ char sptr = va_arg(ap, char );
190	190	int16_t len;
191	191	int size;
192	192
193	193
194	194
195	195
...	...	@@ -196,17 +196,17 @@
196	196
197	197	size = MAX(len, 0);
198	198
199		- *ptr = kmalloc(size + 1, GFP_KERNEL);
200		- if (*ptr == NULL) {
	199	+ *sptr = kmalloc(size + 1, GFP_KERNEL);
	200	+ if (*sptr == NULL) {
201	201	errcode = -EFAULT;
202	202	break;
203	203	}
204		- if (pdu_read(pdu, *ptr, size)) {
	204	+ if (pdu_read(pdu, *sptr, size)) {
205	205	errcode = -EFAULT;
206		- kfree(*ptr);
207		- *ptr = NULL;
	206	+ kfree(*sptr);
	207	+ *sptr = NULL;
208	208	} else
209		- (*ptr)[size] = 0;
	209	+ (*sptr)[size] = 0;
210	210	}
211	211	break;
212	212	case 'Q':{
213	213
214	214
...	...	@@ -380,13 +380,13 @@
380	380	}
381	381	break;
382	382	case 's':{
383		- const char ptr = va_arg(ap, const char );
	383	+ const char sptr = va_arg(ap, const char );
384	384	int16_t len = 0;
385		- if (ptr)
386		- len = MIN(strlen(ptr), USHORT_MAX);
	385	+ if (sptr)
	386	+ len = MIN(strlen(sptr), USHORT_MAX);
387	387
388	388	errcode = p9pdu_writef(pdu, optional, "w", len);
389		- if (!errcode && pdu_write(pdu, ptr, len))
	389	+ if (!errcode && pdu_write(pdu, sptr, len))
390	390	errcode = -EFAULT;
391	391	}
392	392	break;
...	...	@@ -426,7 +426,7 @@
426	426	case 'U':{
427	427	int32_t count = va_arg(ap, int32_t);
428	428	const char __user *udata =
429		- va_arg(ap, const void *);
	429	+ va_arg(ap, const void __user *);
430	430	errcode =
431	431	p9pdu_writef(pdu, optional, "d", count);
432	432	if (!errcode && pdu_write_u(pdu, udata, count))