leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mm, mempolicy: make mpol_to_str robust and always succeed

Browse Source 
mpol_to_str() should not fail.  Currently, it either fails because the
string buffer is too small or because a string hasn't been defined for a
mempolicy mode.

If a new mempolicy mode is introduced and no string is defined for it,
just warn and return "unknown".

If the buffer is too small, just truncate the string and return, the
same behavior as snprintf().

This also fixes a bug where there was no NULL-byte termination when doing
*p++ = '=' and *p++ ':' and maxlen has been reached.

Signed-off-by: David Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Chen Gang <gang.chen@asianux.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Rientjes
2013-11-12 15:07:28 -08:00
committed by Linus Torvalds
parent 40c3baa7c6
commit 948927ee9e
3 changed files with 24 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/mempolicy.h
View File

@@ -169,7 +169,7 @@ int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
extern int mpol_parse_str(char *str, struct mempolicy **mpol);
#endif
extern int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol);
extern void mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol);
/* Check if a vma is migratable */
static inline int vma_migratable(struct vm_area_struct *vma)
@@ -307,9 +307,8 @@ static inline int mpol_parse_str(char *str, struct mempolicy **mpol)
}
#endif
static inline int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol)
static inline void mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol)
{
return 0;
}
static inline int mpol_misplaced(struct page *page, struct vm_area_struct *vma,