Check the parameters to auplugin_setvbuf

Author: stevegrubb

auplugin/auplugin-fgets.c

@@ -232,20 +232,23 @@ int auplugin_fgets(char *buf, size_t blen, int fd)
 	return auplugin_fgets_r(&global_state, buf, blen, fd);
 }
 
-void auplugin_setvbuf_r(struct auplugin_fgets_state *st, void *buf,
+int auplugin_setvbuf_r(struct auplugin_fgets_state *st, void *buf,
 			size_t buff_size, enum auplugin_mem how)
 {
-	st->buffer = buf ? buf : st->internal;
+	if (st == NULL || buf == NULL || buff_size == 0)
+		return 1;
+	st->buffer = buf;
 	st->current = st->buffer;
 	st->eptr = st->buffer + buff_size;
 	st->eof = 0;
 	st->mem_type = how;
 	st->buff_size = buff_size;
+	return 0;
 }
 
-void auplugin_setvbuf(void *buf, size_t buff_size, enum auplugin_mem how)
+int auplugin_setvbuf(void *buf, size_t buff_size, enum auplugin_mem how)
 {
         auplugin_fgets_ensure_global();
-        auplugin_setvbuf_r(&global_state, buf, buff_size, how);
+        return auplugin_setvbuf_r(&global_state, buf, buff_size, how);
 }
 

auplugin/auplugin.h

@@ -53,7 +53,7 @@ int auplugin_fgets_eof(void);
 int auplugin_fgets_more(size_t blen);
 int auplugin_fgets(char *buf, size_t blen, int fd)
 	__attr_access ((__write_only__, 1, 2));
-void auplugin_setvbuf(void *buf, size_t buff_size, enum auplugin_mem how)
+int auplugin_setvbuf(void *buf, size_t buff_size, enum auplugin_mem how)
 	__attr_access ((__read_only__, 1, 2));
 
 void auplugin_fgets_destroy(auplugin_fgets_state_t *st);
@@ -64,7 +64,7 @@ int auplugin_fgets_eof_r(auplugin_fgets_state_t *st);
 int auplugin_fgets_more_r(auplugin_fgets_state_t *st, size_t blen);
 int auplugin_fgets_r(auplugin_fgets_state_t *st, char *buf, size_t blen, int fd)
 	__attr_access ((__write_only__, 2, 3));
-void auplugin_setvbuf_r(auplugin_fgets_state_t *st, void *buf, size_t buff_size,
+int auplugin_setvbuf_r(auplugin_fgets_state_t *st, void *buf, size_t buff_size,
 			enum auplugin_mem how)
 			__attr_access ((__read_only__, 2, 3));
 

docs/auplugin_fgets.3

@@ -12,9 +12,9 @@ auplugin_fgets, auplugin_fgets_more, auplugin_fgets_eof, auplugin_fgets_clear, a
 .br
 .B void auplugin_fgets_clear(void);
 .br
-.BI "void auplugin_setvbuf(void *" buf ", size_t buff_size, enum auplugin_mem " how ");"
+.BI "int auplugin_setvbuf(void *" buf ", size_t buff_size, enum auplugin_mem " how ");"
 .br
-.BI "void auplugin_setvbuf_r(auplugin_fgets_state_t *" st ", void *" buf ", size_t buff_size, enum auplugin_mem " how ");"
+.BI "int auplugin_setvbuf_r(auplugin_fgets_state_t *" st ", void *" buf ", size_t buff_size, enum auplugin_mem " how ");"
 .SH DESCRIPTION
 .B auplugin_fgets
 reads from
@@ -69,6 +69,9 @@ return 1 for true and 0 for false.
 .PP
 .B auplugin_fgets_clear
 returns no value.
+.PP
+.B auplugin_setvbuf
+returns 0 on success and 1 on failure.
 .SH BACKGROUND
  The reason that this family of functions was created is because in  auditd plugins, the event stream is stdin, which is  descriptor 0.  A typical pattern is to call select, poll, or epoll to wait for a  record to arrive. As soon as it does, you need to read it. If you  use fgets, you will wind up with big problems because you cannot mix  low level descriptors with high level constructs like struct FILE.  This family of functions allows you to correctly work only using descriptors but with the convenience of fgets.