diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-04 20:05:09 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-04 20:05:09 +0000 |
| commit | a013689ddb2a4ba5f0452c053c0bf00bafb686f1 (patch) | |
| tree | daffe3644ed321b602a1f6a4e97dc6c6ef329dfb /fs/cifs/connect.c | |
| parent | d12fd121afd4f87cbc7675f8f6b651d649534f15 (diff) | |
| download | blackbird-op-linux-a013689ddb2a4ba5f0452c053c0bf00bafb686f1.tar.gz blackbird-op-linux-a013689ddb2a4ba5f0452c053c0bf00bafb686f1.zip | |
[CIFS] Fix cifsd so shuts down when signing fails during mount
Fixes two problems:
1) we dropped down to negotiating lanman if we did not recognize the
mechanism (krb5 e.g.)
2) we did not stop cifsd (thus will fail when doing rmod cifs with
slab free errors) when we fail tcon but have a bad session (which is
the case in which signing is required but we don't allow signing on
the client)
It also turns on extended security flag in the header when passing
"sec=krb5" on mount command (although kerberos support is not done of
course)
Acked-by: Jeff Layton <jlayton@redhat.com>
CC: Shaggy <shaggy@us.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index fc3a851357fc..c0cd3ce56e9f 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -2172,8 +2172,18 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, if (tsk) kthread_stop(tsk); } - } else + } else { cFYI(1, ("No session or bad tcon")); + if ((pSesInfo->server) && + (pSesInfo->server->tsk)) { + struct task_struct *tsk; + force_sig(SIGKILL, + pSesInfo->server->tsk); + tsk = pSesInfo->server->tsk; + if (tsk) + kthread_stop(tsk); + } + } sesInfoFree(pSesInfo); /* pSesInfo = NULL; */ } |
