summaryrefslogtreecommitdiffstats
path: root/sys/netsmb/smb_subr.h
diff options
context:
space:
mode:
authorcsjp <csjp@FreeBSD.org>2011-01-08 23:06:54 +0000
committercsjp <csjp@FreeBSD.org>2011-01-08 23:06:54 +0000
commit2801f33bdaf165233d1ce6d66f6fb981044439e0 (patch)
treeda82577cb834eded3f6fc598c03b6ff8e0e5a1e5 /sys/netsmb/smb_subr.h
parent3e182d58727c93f8d8e004eaa52b10668766d806 (diff)
downloadFreeBSD-src-2801f33bdaf165233d1ce6d66f6fb981044439e0.zip
FreeBSD-src-2801f33bdaf165233d1ce6d66f6fb981044439e0.tar.gz
Change some variables from int to size_t. This is more accurate since
these variables represent sizes in one capacity or another. There is no reason to allow negative numbers. Change userspace shared structure elements that get used for the modified functions from int to uint32_t, since it's not clear what userspace programs use these fields, and we do not want to break binary compatibility. This fixes a panic when corrupt or bogus data is passed into the kernel. Obtained from: NetBSD MFC after: 3 weeks
Diffstat (limited to 'sys/netsmb/smb_subr.h')
-rw-r--r--sys/netsmb/smb_subr.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netsmb/smb_subr.h b/sys/netsmb/smb_subr.h
index 12730cc..76d4c06 100644
--- a/sys/netsmb/smb_subr.h
+++ b/sys/netsmb/smb_subr.h
@@ -101,19 +101,19 @@ void smb_makescred(struct smb_cred *scred, struct thread *td, struct ucred *cred
int smb_td_intr(struct thread *);
char *smb_strdup(const char *s);
void *smb_memdup(const void *umem, int len);
-char *smb_strdupin(char *s, int maxlen);
-void *smb_memdupin(void *umem, int len);
+char *smb_strdupin(char *s, size_t maxlen);
+void *smb_memdupin(void *umem, size_t len);
void smb_strtouni(u_int16_t *dst, const char *src);
void smb_strfree(char *s);
void smb_memfree(void *s);
-void *smb_zmalloc(unsigned long size, struct malloc_type *type, int flags);
+void *smb_zmalloc(size_t size, struct malloc_type *type, int flags);
int smb_calcmackey(struct smb_vc *vcp);
int smb_encrypt(const u_char *apwd, u_char *C8, u_char *RN);
int smb_ntencrypt(const u_char *apwd, u_char *C8, u_char *RN);
int smb_maperror(int eclass, int eno);
int smb_put_dmem(struct mbchain *mbp, struct smb_vc *vcp,
- const char *src, int len, int caseopt);
+ const char *src, size_t len, int caseopt);
int smb_put_dstring(struct mbchain *mbp, struct smb_vc *vcp,
const char *src, int caseopt);
int smb_put_string(struct smb_rq *rqp, const char *src);
OpenPOWER on IntegriCloud