summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2003-02-16 11:28:55 +0000
committerdes <des@FreeBSD.org>2003-02-16 11:28:55 +0000
commit2e76ae7fcb083b0e01d79ec91adf2b88a4e9a519 (patch)
tree9f714cc61868750c60e421783802e005668a82a1 /contrib
parent5945314a7a72384610ca7385f7bf6aa3bda5288b (diff)
downloadFreeBSD-src-2e76ae7fcb083b0e01d79ec91adf2b88a4e9a519.zip
FreeBSD-src-2e76ae7fcb083b0e01d79ec91adf2b88a4e9a519.tar.gz
MFP4: guard against null pointer dereference which sshd can cause (#25271)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/openpam/lib/pam_vprompt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/openpam/lib/pam_vprompt.c b/contrib/openpam/lib/pam_vprompt.c
index 15fdc81..83262c4 100644
--- a/contrib/openpam/lib/pam_vprompt.c
+++ b/contrib/openpam/lib/pam_vprompt.c
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/openpam/lib/pam_vprompt.c#8 $
+ * $P4: //depot/projects/openpam/lib/pam_vprompt.c#9 $
*/
#include <stdarg.h>
@@ -66,7 +66,7 @@ pam_vprompt(pam_handle_t *pamh,
r = pam_get_item(pamh, PAM_CONV, (const void **)&conv);
if (r != PAM_SUCCESS)
RETURNC(r);
- if (conv == NULL) {
+ if (conv == NULL || conv->conv == NULL) {
openpam_log(PAM_LOG_ERROR, "no conversation function");
RETURNC(PAM_SYSTEM_ERR);
}
OpenPOWER on IntegriCloud