aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhenlei Huang <zlei@FreeBSD.org>2024-09-03 10:25:20 +0000
committerZhenlei Huang <zlei@FreeBSD.org>2024-09-30 05:05:30 +0000
commitbe02b9a1142e39dd537056c4917a86a97d901eb3 (patch)
treea467e40fd87cd125e306e30db281c6f37504ba38
parent019abb5cf986a851cef6aa65e5a39b4955649357 (diff)
netsmb: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 6e50988cf822f87a524b8da2fdc35b234078cc2f) (cherry picked from commit ce708880847cb8d87ac0d7499fdb6f08cc33a7f8)
-rw-r--r--sys/netsmb/smb_rq.c4
-rw-r--r--sys/netsmb/smb_subr.c2
2 files changed, 0 insertions, 6 deletions
diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c
index 71f6e221ace9..0170514f52ce 100644
--- a/sys/netsmb/smb_rq.c
+++ b/sys/netsmb/smb_rq.c
@@ -65,8 +65,6 @@ smb_rq_alloc(struct smb_connobj *layer, u_char cmd, struct smb_cred *scred,
int error;
rqp = malloc(sizeof(*rqp), M_SMBRQ, M_WAITOK);
- if (rqp == NULL)
- return ENOMEM;
error = smb_rq_init(rqp, layer, cmd, scred);
rqp->sr_flags |= SMBR_ALLOCED;
if (error) {
@@ -377,8 +375,6 @@ smb_t2_alloc(struct smb_connobj *layer, u_short setup, struct smb_cred *scred,
int error;
t2p = malloc(sizeof(*t2p), M_SMBRQ, M_WAITOK);
- if (t2p == NULL)
- return ENOMEM;
error = smb_t2_init(t2p, layer, setup, scred);
t2p->t2_flags |= SMBT2_ALLOCED;
if (error) {
diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c
index 8094f9593957..73961f7a8c81 100644
--- a/sys/netsmb/smb_subr.c
+++ b/sys/netsmb/smb_subr.c
@@ -150,8 +150,6 @@ smb_memdup(const void *umem, int len)
if (len > 8 * 1024)
return NULL;
p = malloc(len, M_SMBSTR, M_WAITOK);
- if (p == NULL)
- return NULL;
bcopy(umem, p, len);
return p;
}