Skip to content

L
linux
Commit 7d83dc5e authored by Steve French's avatar Steve French
Browse files
Options

Fix sparse tool compile warnings for cifs 

Signed-off-by: Steve French (sfrench@us.ibm.com>
parent 981a1ad3
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
fs/cifs/cifs_debug.c
View file @ 7d83dc5e
...@@ -400,7 +400,7 @@ cifsFYI_read(char *page, char **start, off_t off, int count, ...@@ -400,7 +400,7 @@ cifsFYI_read(char *page, char **start, off_t off, int count,
return len; return len;
} }
static int static int
cifsFYI_write(struct file *file, const char *buffer, cifsFYI_write(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
char c; char c;
...@@ -439,7 +439,7 @@ oplockEnabled_read(char *page, char **start, off_t off, ...@@ -439,7 +439,7 @@ oplockEnabled_read(char *page, char **start, off_t off,
return len; return len;
} }
static int static int
oplockEnabled_write(struct file *file, const char *buffer, oplockEnabled_write(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
char c; char c;
...@@ -479,7 +479,7 @@ quotaEnabled_read(char *page, char **start, off_t off, ...@@ -479,7 +479,7 @@ quotaEnabled_read(char *page, char **start, off_t off,
return len; return len;
} }
static int static int
quotaEnabled_write(struct file *file, const char *buffer, quotaEnabled_write(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
char c; char c;
...@@ -519,7 +519,7 @@ linuxExtensionsEnabled_read(char *page, char **start, off_t off, ...@@ -519,7 +519,7 @@ linuxExtensionsEnabled_read(char *page, char **start, off_t off,
return len; return len;
} }
static int static int
linuxExtensionsEnabled_write(struct file *file, const char *buffer, linuxExtensionsEnabled_write(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
char c; char c;
...@@ -559,7 +559,7 @@ lookupFlag_read(char *page, char **start, off_t off, ...@@ -559,7 +559,7 @@ lookupFlag_read(char *page, char **start, off_t off,
return len; return len;
} }
static int static int
lookupFlag_write(struct file *file, const char *buffer, lookupFlag_write(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
char c; char c;
...@@ -597,7 +597,7 @@ traceSMB_read(char *page, char **start, off_t off, int count, ...@@ -597,7 +597,7 @@ traceSMB_read(char *page, char **start, off_t off, int count,
return len; return len;
} }
static int static int
traceSMB_write(struct file *file, const char *buffer, traceSMB_write(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
char c; char c;
...@@ -636,7 +636,7 @@ multiuser_mount_read(char *page, char **start, off_t off, ...@@ -636,7 +636,7 @@ multiuser_mount_read(char *page, char **start, off_t off,
return len; return len;
} }
static int static int
multiuser_mount_write(struct file *file, const char *buffer, multiuser_mount_write(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
char c; char c;
...@@ -675,7 +675,7 @@ extended_security_read(char *page, char **start, off_t off, ...@@ -675,7 +675,7 @@ extended_security_read(char *page, char **start, off_t off,
return len; return len;
} }
static int static int
extended_security_write(struct file *file, const char *buffer, extended_security_write(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
char c; char c;
...@@ -714,7 +714,7 @@ ntlmv2_enabled_read(char *page, char **start, off_t off, ...@@ -714,7 +714,7 @@ ntlmv2_enabled_read(char *page, char **start, off_t off,
return len; return len;
} }
static int static int
ntlmv2_enabled_write(struct file *file, const char *buffer, ntlmv2_enabled_write(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
char c; char c;
...@@ -753,7 +753,7 @@ packet_signing_enabled_read(char *page, char **start, off_t off, ...@@ -753,7 +753,7 @@ packet_signing_enabled_read(char *page, char **start, off_t off,
return len; return len;
} }
static int static int
packet_signing_enabled_write(struct file *file, const char *buffer, packet_signing_enabled_write(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
char c; char c;
......
fs/cifs/cifsfs.c
View file @ 7d83dc5e
...@@ -426,7 +426,7 @@ cifs_get_sb(struct file_system_type *fs_type, ...@@ -426,7 +426,7 @@ cifs_get_sb(struct file_system_type *fs_type,
} }
static ssize_t static ssize_t
cifs_read_wrapper(struct file * file, char *read_data, size_t read_size, cifs_read_wrapper(struct file * file, char __user *read_data, size_t read_size,
loff_t * poffset) loff_t * poffset)
{ {
if(file == NULL) if(file == NULL)
...@@ -455,7 +455,7 @@ cifs_read_wrapper(struct file * file, char *read_data, size_t read_size, ...@@ -455,7 +455,7 @@ cifs_read_wrapper(struct file * file, char *read_data, size_t read_size,
} }
static ssize_t static ssize_t
cifs_write_wrapper(struct file * file, const char *write_data, cifs_write_wrapper(struct file * file, const char __user *write_data,
size_t write_size, loff_t * poffset) size_t write_size, loff_t * poffset)
{ {
ssize_t written; ssize_t written;
......
fs/cifs/cifsfs.h
View file @ 7d83dc5e
...@@ -85,7 +85,7 @@ extern struct dentry_operations cifs_dentry_ops; ...@@ -85,7 +85,7 @@ extern struct dentry_operations cifs_dentry_ops;
/* Functions related to symlinks */ /* Functions related to symlinks */
extern int cifs_follow_link(struct dentry *direntry, struct nameidata *nd); extern int cifs_follow_link(struct dentry *direntry, struct nameidata *nd);
extern int cifs_readlink(struct dentry *direntry, char *buffer, int buflen); extern int cifs_readlink(struct dentry *direntry, char __user *buffer, int buflen);
extern int cifs_symlink(struct inode *inode, struct dentry *direntry, extern int cifs_symlink(struct inode *inode, struct dentry *direntry,
const char *symname); const char *symname);
extern int cifs_removexattr(struct dentry *, const char *); extern int cifs_removexattr(struct dentry *, const char *);
......
fs/cifs/connect.c
View file @ 7d83dc5e
...@@ -279,7 +279,7 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server) ...@@ -279,7 +279,7 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)
length = sock_recvmsg(csocket, &smb_msg, 4, 0); length = sock_recvmsg(csocket, &smb_msg, 4, 0);
cFYI(0,("Received 4 byte keep alive packet")); cFYI(0,("Received 4 byte keep alive packet"));
} else if (temp[0] == (char) RFC1002_POSITIVE_SESSION_RESPONSE) { } else if (temp[0] == (char) RFC1002_POSITIVE_SESSION_RESPONSE) {
iov.iov_base = smb_buffer; iov.iov_base = smb_buffer;
iov.iov_len = 4; iov.iov_len = 4;
length = sock_recvmsg(csocket, &smb_msg, 4, 0); length = sock_recvmsg(csocket, &smb_msg, 4, 0);
cFYI(1,("Good RFC 1002 session rsp")); cFYI(1,("Good RFC 1002 session rsp"));
...@@ -1559,7 +1559,7 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, ...@@ -1559,7 +1559,7 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,
bcc_ptr += bcc_ptr +=
pSMBr->resp.SecurityBlobLength; pSMBr->resp.SecurityBlobLength;
if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) { if (smb_buffer->Flags2 & SMBFLG2_UNICODE) {
if ((long) (bcc_ptr) % 2) { if ((long) (bcc_ptr) % 2) {
remaining_words = remaining_words =
(BCC(smb_buffer_response) (BCC(smb_buffer_response)
...@@ -1812,7 +1812,7 @@ CIFSSpnegoSessSetup(unsigned int xid, struct cifsSesInfo *ses, ...@@ -1812,7 +1812,7 @@ CIFSSpnegoSessSetup(unsigned int xid, struct cifsSesInfo *ses,
pSMBr->resp.SecurityBlobLength)); pSMBr->resp.SecurityBlobLength));
} }
if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) { if (smb_buffer->Flags2 & SMBFLG2_UNICODE) {
if ((long) (bcc_ptr) % 2) { if ((long) (bcc_ptr) % 2) {
remaining_words = remaining_words =
(BCC(smb_buffer_response) (BCC(smb_buffer_response)
...@@ -2123,7 +2123,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, ...@@ -2123,7 +2123,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
ses->server->secMode |= ses->server->secMode |=
SECMODE_SIGN_ENABLED; SECMODE_SIGN_ENABLED;
if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) { if (smb_buffer->Flags2 & SMBFLG2_UNICODE) {
if ((long) (bcc_ptr) % 2) { if ((long) (bcc_ptr) % 2) {
remaining_words = remaining_words =
(BCC(smb_buffer_response) (BCC(smb_buffer_response)
...@@ -2519,7 +2519,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses, ...@@ -2519,7 +2519,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
cFYI(1, cFYI(1,
("NTLMSSP response to Authenticate ")); ("NTLMSSP response to Authenticate "));
if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) { if (smb_buffer->Flags2 & SMBFLG2_UNICODE) {
if ((long) (bcc_ptr) % 2) { if ((long) (bcc_ptr) % 2) {
remaining_words = remaining_words =
(BCC(smb_buffer_response) (BCC(smb_buffer_response)
...@@ -2718,7 +2718,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, ...@@ -2718,7 +2718,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
/* skip service field (NB: this field is always ASCII) */ /* skip service field (NB: this field is always ASCII) */
bcc_ptr += length + 1; bcc_ptr += length + 1;
strncpy(tcon->treeName, tree, MAX_TREE_SIZE); strncpy(tcon->treeName, tree, MAX_TREE_SIZE);
if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) { if (smb_buffer->Flags2 & SMBFLG2_UNICODE) {
length = UniStrnlen((wchar_t *) bcc_ptr, 512); length = UniStrnlen((wchar_t *) bcc_ptr, 512);
if (((long) bcc_ptr + (2 * length)) - if (((long) bcc_ptr + (2 * length)) -
(long) pByteArea(smb_buffer_response) <= (long) pByteArea(smb_buffer_response) <=
......
fs/cifs/link.c
View file @ 7d83dc5e
...@@ -210,7 +210,7 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname) ...@@ -210,7 +210,7 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname)
} }
int int
cifs_readlink(struct dentry *direntry, char *pBuffer, int buflen) cifs_readlink(struct dentry *direntry, char __user *pBuffer, int buflen)
{ {
struct inode *inode = direntry->d_inode; struct inode *inode = direntry->d_inode;
int rc = -EACCES; int rc = -EACCES;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7